diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index dab1228a695..21a7e9fbb70 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -21,7 +21,7 @@ name: checkstyle on: pull_request: branches: - - 2.8.x + - 2.9.x jobs: checkstyle: @@ -32,7 +32,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: checkstyle run: mvn -B -Pit install -DskipTests -Dspotbugs.skip=true checkstyle:check diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6037e44da11..3d5f372d76f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,9 +21,9 @@ name: Java CI with Maven on: push: - branches: [ 2.8.x ] + branches: [ 2.9.x ] pull_request: - branches: [ 2.8.x ] + branches: [ 2.9.x ] jobs: build: @@ -36,7 +36,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '21' distribution: 'temurin' - name: Set up Maven uses: stCarolas/setup-maven@v4.5 diff --git a/.github/workflows/rat_check.yml b/.github/workflows/rat_check.yml index 0148c9020e9..cc1367a76a6 100644 --- a/.github/workflows/rat_check.yml +++ b/.github/workflows/rat_check.yml @@ -21,10 +21,10 @@ name: rat check on: push: branches: - - 2.8.x + - 2.9.x pull_request: branches: - - 2.8.x + - 2.9.x jobs: rat_check: @@ -35,7 +35,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '21' distribution: 'temurin' - name: rat check run: mvn apache-rat:check -B -Pit,distribution diff --git a/.github/workflows/spotbugs.yml b/.github/workflows/spotbugs.yml index dddae01a952..cddb5768eb5 100644 --- a/.github/workflows/spotbugs.yml +++ b/.github/workflows/spotbugs.yml @@ -21,7 +21,7 @@ name: spot bugs on: pull_request: branches: - - 2.8.x + - 2.9.x jobs: spotbugs: @@ -32,7 +32,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '8' + java-version: '21' distribution: 'temurin' - name: spotbugs run: mvn -B -Pit -DskipTests clean verify spotbugs:spotbugs diff --git a/.github/workflows/unit-test-jdk17.yml b/.github/workflows/unit-test-jdk17.yml index 20102a3aa58..1e66fae5368 100644 --- a/.github/workflows/unit-test-jdk17.yml +++ b/.github/workflows/unit-test-jdk17.yml @@ -22,7 +22,7 @@ name: Unit Test Jdk17 on: pull_request: branches: - - 2.8.x + - 2.9.x jobs: unit-tests: diff --git a/.github/workflows/unit-test-jdk11.yml b/.github/workflows/unit-test-jdk21.yml similarity index 93% rename from .github/workflows/unit-test-jdk11.yml rename to .github/workflows/unit-test-jdk21.yml index 39f644a2dc2..0f83cf44428 100644 --- a/.github/workflows/unit-test-jdk11.yml +++ b/.github/workflows/unit-test-jdk21.yml @@ -17,12 +17,12 @@ # under the License. # -name: Unit Test Jdk11 +name: Unit Test Jdk21 on: pull_request: branches: - - 2.8.x + - 2.9.x jobs: unit-tests: @@ -33,7 +33,7 @@ jobs: - name: Set up jdk uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '21' distribution: 'temurin' - name: Compilation and Installation - run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean test + run: mvn -B -Dcheckstyle.skip -Dspotbugs.skip=true clean install -Pit \ No newline at end of file diff --git a/LICENSE b/LICENSE index 521832a32a7..39b32e70bbd 100644 --- a/LICENSE +++ b/LICENSE @@ -244,4 +244,15 @@ For foundations/foundation-protobuf/src/main/java/io/protostuff/runtime/ArrayFie foundations/foundation-protobuf/src/main/java/io/protostuff/SchemaWriter.java ================================================================ This product bundles files from protostuff which is licensed under the Apache License v2. -For details, see https://github.com/protostuff/protostuff \ No newline at end of file +For details, see https://github.com/protostuff/protostuff + +================================================================ +For swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/AbstractModelConverterAdapterJakarta.java + swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/JAXBAnnotationsHelperAdapterJakarta.java + swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelConvertersAdapterJakarta.java + swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelResolverAdapterJakarta.java + swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ParameterProcessorAdapterJakarta.java + swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/SwaggerAnnotationIntrospectorAdapterJakarta.java +================================================================ +This product bundles files from swagger which is licensed under the Apache License v2. +For details, see https://github.com/swagger-api/swagger-core \ No newline at end of file diff --git a/archetypes/business-service-jaxrs/pom.xml b/archetypes/business-service-jaxrs/pom.xml index ef648f2b524..bdc0967fa74 100644 --- a/archetypes/business-service-jaxrs/pom.xml +++ b/archetypes/business-service-jaxrs/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb archetypes - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.archetypes diff --git a/archetypes/business-service-pojo/pom.xml b/archetypes/business-service-pojo/pom.xml index a1a41863372..ae6bb946e2b 100644 --- a/archetypes/business-service-pojo/pom.xml +++ b/archetypes/business-service-pojo/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb archetypes - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.archetypes diff --git a/archetypes/business-service-spring-boot2-starter/pom.xml b/archetypes/business-service-spring-boot2-starter/pom.xml index 4ad2aaac50d..9cdc31a6adc 100644 --- a/archetypes/business-service-spring-boot2-starter/pom.xml +++ b/archetypes/business-service-spring-boot2-starter/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb archetypes - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.archetypes diff --git a/archetypes/business-service-springmvc/pom.xml b/archetypes/business-service-springmvc/pom.xml index 033b441bb02..90492c8ef43 100644 --- a/archetypes/business-service-springmvc/pom.xml +++ b/archetypes/business-service-springmvc/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb archetypes - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.archetypes diff --git a/archetypes/pom.xml b/archetypes/pom.xml index feaa1b6aabd..d833667cd96 100644 --- a/archetypes/pom.xml +++ b/archetypes/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default diff --git a/ci/spotbugs/exclude.xml b/ci/spotbugs/exclude.xml index 0bd13321193..8cb7f8d08a4 100644 --- a/ci/spotbugs/exclude.xml +++ b/ci/spotbugs/exclude.xml @@ -260,4 +260,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/clients/config-center-client/pom.xml b/clients/config-center-client/pom.xml index 224ff43b5bd..69afc03af90 100644 --- a/clients/config-center-client/pom.xml +++ b/clients/config-center-client/pom.xml @@ -22,7 +22,7 @@ clients org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/clients/config-common/pom.xml b/clients/config-common/pom.xml index 2701e27755e..b6697312b10 100644 --- a/clients/config-common/pom.xml +++ b/clients/config-common/pom.xml @@ -22,7 +22,7 @@ clients org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/clients/config-kie-client/pom.xml b/clients/config-kie-client/pom.xml index 077a7cd1fdd..1a2b9a0607a 100644 --- a/clients/config-kie-client/pom.xml +++ b/clients/config-kie-client/pom.xml @@ -22,7 +22,7 @@ clients org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/clients/dashboard-client/pom.xml b/clients/dashboard-client/pom.xml index 4180e2fa0f8..a28df30ec1d 100644 --- a/clients/dashboard-client/pom.xml +++ b/clients/dashboard-client/pom.xml @@ -22,7 +22,7 @@ clients org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/clients/http-client-common/pom.xml b/clients/http-client-common/pom.xml index e277959d88e..04b1dec2ed5 100644 --- a/clients/http-client-common/pom.xml +++ b/clients/http-client-common/pom.xml @@ -22,7 +22,7 @@ clients org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/clients/pom.xml b/clients/pom.xml index 151c26f9664..8c67a48f73f 100644 --- a/clients/pom.xml +++ b/clients/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/clients/service-center-client/pom.xml b/clients/service-center-client/pom.xml index 904bb8b7307..8da102a344a 100755 --- a/clients/service-center-client/pom.xml +++ b/clients/service-center-client/pom.xml @@ -22,7 +22,7 @@ clients org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/common/common-access-log/pom.xml b/common/common-access-log/pom.xml index fba752f8be8..1c4d615242b 100644 --- a/common/common-access-log/pom.xml +++ b/common/common-access-log/pom.xml @@ -21,7 +21,7 @@ common org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/common/common-protobuf/pom.xml b/common/common-protobuf/pom.xml index fa2a958d5a0..72f17065874 100644 --- a/common/common-protobuf/pom.xml +++ b/common/common-protobuf/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb common - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT common-protobuf Java Chassis::Common::Protobuf diff --git a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/OperationProtobuf.java b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/OperationProtobuf.java index 2f0579fb760..97508eb144a 100644 --- a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/OperationProtobuf.java +++ b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/OperationProtobuf.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.Map.Entry; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status.Family; import org.apache.servicecomb.codec.protobuf.utils.ScopedProtobufSchemaManager; import org.apache.servicecomb.core.Invocation; diff --git a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ProtobufManager.java b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ProtobufManager.java index 07821788cb2..09ccb9d70cd 100644 --- a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ProtobufManager.java +++ b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/definition/ProtobufManager.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Objects; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.codec.protobuf.utils.ScopedProtobufSchemaManager; import org.apache.servicecomb.core.Invocation; diff --git a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/ProtoMethod.java b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/ProtoMethod.java index e8d8a093c13..8cedce71ad0 100644 --- a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/ProtoMethod.java +++ b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/ProtoMethod.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.context.HttpStatus; diff --git a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java index ec113ac0172..f7944e26a54 100644 --- a/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java +++ b/common/common-protobuf/src/main/java/org/apache/servicecomb/codec/protobuf/internal/converter/SwaggerToProtoGenerator.java @@ -28,8 +28,8 @@ import java.util.Map.Entry; import java.util.Set; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.foundation.protobuf.internal.ProtoConst; diff --git a/common/common-rest/pom.xml b/common/common-rest/pom.xml index 91cd302f752..ef8a79838d5 100644 --- a/common/common-rest/pom.xml +++ b/common/common-rest/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb common - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT common-rest @@ -65,10 +65,5 @@ swagger-generator-jaxrs test - - org.mockito - mockito-inline - test - diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java index a9431a99074..1f3d18766cd 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/AbstractRestInvocation.java @@ -24,8 +24,8 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; @@ -322,7 +322,7 @@ protected void sendResponse(Response response) { RestServerCodecFilter.copyHeadersToHttpResponse(response.getHeaders(), responseEx); if (!(response.getResult() instanceof ServerWebSocket)) { - responseEx.setStatus(response.getStatusCode(), response.getReasonPhrase()); + responseEx.setStatus(response.getStatusCode()); } responseEx.setAttribute(RestConst.INVOCATION_HANDLER_RESPONSE, response); responseEx.setAttribute(RestConst.INVOCATION_HANDLER_PROCESSOR, produceProcessor); diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreator.java index 73bad7e8d47..825d850ba9d 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreator.java @@ -16,16 +16,16 @@ */ package org.apache.servicecomb.common.rest; -import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.apache.servicecomb.core.exception.ExceptionCodes.GENERIC_CLIENT; import static org.apache.servicecomb.core.exception.ExceptionCodes.NOT_DEFINED_ANY_SCHEMA; import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.ws.rs.core.HttpHeaders; +import jakarta.annotation.Nonnull; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestVertxProducerInvocationCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestVertxProducerInvocationCreator.java index fcae4c7ab7f..37f4083a835 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestVertxProducerInvocationCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/RestVertxProducerInvocationCreator.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.common.rest; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Endpoint; import org.apache.servicecomb.core.Invocation; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/UploadConfig.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/UploadConfig.java index 302de2c8b41..a5d921b1a67 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/UploadConfig.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/UploadConfig.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.common.rest; -import javax.servlet.MultipartConfigElement; +import jakarta.servlet.MultipartConfigElement; import com.netflix.config.DynamicPropertyFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestCodec.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestCodec.java index 39fc4de26ec..f417adf6b17 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestCodec.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/RestCodec.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.definition.RestOperationMeta; import org.apache.servicecomb.common.rest.definition.RestParam; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodec.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodec.java index 546605d6bcd..6b6e06f41e1 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodec.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodec.java @@ -25,7 +25,7 @@ import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.common.rest.codec.param.HeaderProcessorCreator.HeaderProcessor; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public interface HeaderCodec { static String encodeValue(Object value) throws UnsupportedEncodingException { diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecMulti.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecMulti.java index e53e09ca080..a52e266cf8d 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecMulti.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecMulti.java @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.Enumeration; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecSimple.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecSimple.java index 3c37e56e2a4..73beed49037 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecSimple.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecSimple.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.common.rest.codec.header; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecWithDelimiter.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecWithDelimiter.java index 75481c8ce97..e14f3393b9f 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecWithDelimiter.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/header/HeaderCodecWithDelimiter.java @@ -21,8 +21,8 @@ import java.util.Collection; import java.util.StringJoiner; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java index d05b2a91e16..88e604d418c 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/BodyProcessorCreator.java @@ -23,10 +23,10 @@ import java.nio.charset.StandardCharsets; import java.util.Locale; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java index a21c23719e5..95d29d3255f 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/CookieProcessorCreator.java @@ -20,9 +20,9 @@ import java.lang.reflect.Type; import java.util.Objects; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/FormProcessorCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/FormProcessorCreator.java index de5ad07e4cc..33a39641a66 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/FormProcessorCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/FormProcessorCreator.java @@ -23,9 +23,9 @@ import java.util.function.Function; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.RestClientRequest; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/HeaderProcessorCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/HeaderProcessorCreator.java index 30846a27cac..974bd52f5e8 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/HeaderProcessorCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/HeaderProcessorCreator.java @@ -19,8 +19,8 @@ import java.lang.reflect.Type; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.header.HeaderCodec; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/ParamValueProcessor.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/ParamValueProcessor.java index 8c933a2a1d1..5d5dfc32cf0 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/ParamValueProcessor.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/ParamValueProcessor.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.common.rest.codec.param; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java index 71d585eb04b..26eb9ef2d5a 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/PathProcessorCreator.java @@ -21,7 +21,7 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.RestClientRequest; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/QueryProcessorCreator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/QueryProcessorCreator.java index ad633201e39..09f5a55faca 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/QueryProcessorCreator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/QueryProcessorCreator.java @@ -19,8 +19,8 @@ import java.lang.reflect.Type; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.codec.RestClientRequest; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java index 24496230191..6ebfcc0eae8 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/param/RestClientRequestImpl.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.common.rest.codec.param; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA; import java.net.URLEncoder; import java.nio.charset.StandardCharsets; @@ -29,9 +29,6 @@ import java.util.Map.Entry; import java.util.UUID; -import javax.servlet.http.Part; -import javax.ws.rs.core.MediaType; - import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.foundation.common.utils.PartUtils; @@ -54,6 +51,8 @@ import io.vertx.core.buffer.Buffer; import io.vertx.core.http.HttpClientRequest; import io.vertx.core.http.HttpHeaders; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.MediaType; public class RestClientRequestImpl implements RestClientRequest { private static final Logger LOGGER = LoggerFactory.getLogger(RestClientRequestImpl.class); diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceJsonProcessor.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceJsonProcessor.java index 61989afc7b0..e14451389e5 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceJsonProcessor.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceJsonProcessor.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.io.OutputStream; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceProcessorManager.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceProcessorManager.java index c5d8693b368..c883fa4c16a 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceProcessorManager.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceProcessorManager.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.foundation.common.RegisterManager; import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java index 0fa64ba9305..d5739be4850 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/produce/ProduceTextPlainProcessor.java @@ -21,7 +21,7 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/AbstractQueryCodec.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/AbstractQueryCodec.java index e34d8996bdc..b53d36c3c45 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/AbstractQueryCodec.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/AbstractQueryCodec.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.Collections; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodec.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodec.java index 61364a806fe..9016f09710c 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodec.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodec.java @@ -20,9 +20,9 @@ import java.net.URLEncoder; import java.nio.charset.StandardCharsets; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecJson.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecJson.java index ccf4892735c..20bcf372690 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecJson.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecJson.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.common.rest.codec.query; -import javax.annotation.Nullable; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.annotation.Nullable; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMulti.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMulti.java index 2a0c19163ce..98286b42d66 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMulti.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecMulti.java @@ -18,8 +18,8 @@ import java.util.Collection; -import javax.annotation.Nonnull; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Nonnull; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor; import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecWithDelimiter.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecWithDelimiter.java index ba9a011666a..fa1019afefd 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecWithDelimiter.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecWithDelimiter.java @@ -19,8 +19,8 @@ import java.util.Collection; import java.util.StringJoiner; -import javax.annotation.Nonnull; -import javax.servlet.http.HttpServletRequest; +import jakarta.annotation.Nonnull; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor; import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecs.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecs.java index 6be3c775bd1..0c162b45b4f 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecs.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecs.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsUtils.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsUtils.java index d66a6d84c1a..9e535920a3f 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsUtils.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecsUtils.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.common.rest.codec.query; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.springframework.stereotype.Component; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java index 45a2e2d06a6..5061ef783cc 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/RestOperationMeta.java @@ -25,8 +25,8 @@ import java.util.Locale; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilder.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilder.java index 8d9e07eadf5..d8733575b01 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilder.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/definition/path/URLPathBuilder.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator; import org.apache.servicecomb.common.rest.definition.RestParam; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilter.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilter.java index a6d166eca3a..eaf62b632a4 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilter.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilter.java @@ -25,8 +25,8 @@ import java.util.Map.Entry; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.servlet.http.Part; +import jakarta.annotation.Nonnull; +import jakarta.servlet.http.Part; import org.apache.servicecomb.common.rest.HttpTransportContext; import org.apache.servicecomb.common.rest.RestConst; @@ -95,7 +95,7 @@ protected CompletableFuture encodeResponse(Invocation invocation, Resp @SuppressWarnings("deprecation") public static CompletableFuture encodeResponse(Response response, boolean download, ProduceProcessor produceProcessor, HttpServletResponseEx responseEx) { - responseEx.setStatus(response.getStatusCode(), response.getReasonPhrase()); + responseEx.setStatus(response.getStatusCode()); copyHeadersToHttpResponse(response.getHeaders(), responseEx); if (download) { diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/locator/OperationLocator.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/locator/OperationLocator.java index 9a088e70d85..02c141c42a4 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/locator/OperationLocator.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/locator/OperationLocator.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.definition.RestOperationMeta; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/ClassPathStaticResourceHandler.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/ClassPathStaticResourceHandler.java index 1bc6fa8e429..3884d85a86c 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/ClassPathStaticResourceHandler.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/ClassPathStaticResourceHandler.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.net.URL; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.InputStreamPart; diff --git a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/StaticResourceHandler.java b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/StaticResourceHandler.java index e5655321a06..a01813fbd70 100644 --- a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/StaticResourceHandler.java +++ b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/resource/StaticResourceHandler.java @@ -19,9 +19,9 @@ import java.io.IOException; import java.net.URI; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java index a35ad039723..953cfc798b2 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/RestProducerInvocationCreatorTest.java @@ -17,15 +17,15 @@ package org.apache.servicecomb.common.rest; -import static javax.ws.rs.core.Response.Status.NOT_ACCEPTABLE; -import static javax.ws.rs.core.Response.Status.NOT_FOUND; +import static jakarta.ws.rs.core.Response.Status.NOT_ACCEPTABLE; +import static jakarta.ws.rs.core.Response.Status.NOT_FOUND; import static org.apache.servicecomb.common.rest.RestConst.DECODE_INVOCATION_CONTEXT; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; import java.util.ArrayList; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.common.rest.definition.RestOperationMeta; import org.apache.servicecomb.common.rest.locator.OperationLocator; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java index a73790a068a..0d327ae0646 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestAbstractRestInvocation.java @@ -31,11 +31,11 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; -import javax.servlet.AsyncContext; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessorManager; import org.apache.servicecomb.common.rest.definition.RestMetaUtils; @@ -88,7 +88,6 @@ @SuppressWarnings("deprecation") public class TestAbstractRestInvocation { - HttpServletRequestEx requestEx = Mockito.mock(HttpServletRequestEx.class); final HttpServletResponse servletResponse = Mockito.mock(HttpServletResponse.class); @@ -529,7 +528,7 @@ public void sendResponseStatusAndContentTypeAndHeader() { result.put("statusCode", 123); result.put("reasonPhrase", "reason"); return null; - }).when(responseEx).setStatus(123, "reason"); + }).when(responseEx).setStatus(123); Mockito.doAnswer(invocationOnMock -> { result.put("contentType", "application/json; charset=utf-8"); return null; @@ -825,7 +824,6 @@ public void scheduleInvocationNormal() { Executor executor = new ReactiveExecutor(); requestEx = new AbstractHttpServletRequestForTest(); requestEx = Mockito.spy(requestEx); - responseEx = Mockito.spy(responseEx); restOperation = Mockito.spy(restOperation); operationMeta = Mockito.spy(operationMeta); Mockito.when(restOperation.getOperationMeta()).thenReturn(operationMeta); @@ -913,9 +911,8 @@ public AsyncContext getAsyncContext() { responseEx = new AbstractHttpServletResponse() { @SuppressWarnings("deprecation") @Override - public void setStatus(int sc, String sm) { + public void setStatus(int sc) { status.value = sc; - reasonPhrase.value = sm; } @Override @@ -934,7 +931,6 @@ public void setContentType(String type) { restInvocation.scheduleInvocation(); Assertions.assertEquals(Integer.valueOf(590), status.value); - Assertions.assertEquals("Unexpected producer error, please check logs for details", reasonPhrase.value); Assertions.assertEquals(Integer.valueOf(1), endCount.value); } @@ -955,9 +951,8 @@ public void scheduleInvocation_flowControlReject() { responseEx = new AbstractHttpServletResponse() { @SuppressWarnings("deprecation") @Override - public void setStatus(int sc, String sm) { + public void setStatus(int sc) { status.value = sc; - reasonPhrase.value = sm; } @Override @@ -979,7 +974,6 @@ public void setBodyBuffer(Buffer bodyBuffer) { restInvocation.scheduleInvocation(); Assertions.assertEquals(Integer.valueOf(429), status.value); - Assertions.assertEquals("Too Many Requests", reasonPhrase.value); Assertions.assertEquals("{\"message\":\"rejected by qps flowcontrol\"}", responseBody.value); Assertions.assertEquals(Integer.valueOf(1), endCount.value); } diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java index fee6a0e1f64..d3cb758dd6c 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestRestProducerInvocation.java @@ -98,7 +98,7 @@ private void initRestProducerInvocation() { @Test public void invokeSendFail() { - InvocationException expected = new InvocationException(javax.ws.rs.core.Response.Status.BAD_REQUEST, "test"); + InvocationException expected = new InvocationException(jakarta.ws.rs.core.Response.Status.BAD_REQUEST, "test"); restProducerInvocation = Mockito.spy(new RestProducerInvocation()); Mockito.doThrow(expected).when(restProducerInvocation).findRestOperation(); Mockito.doAnswer(invocationOnMock -> { diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java index 4081818d057..4ef76bdee5e 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/TestUploadConfig.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.common.rest; -import javax.servlet.MultipartConfigElement; +import jakarta.servlet.MultipartConfigElement; import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils; import org.junit.jupiter.api.AfterEach; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java index 20a4e7db74f..231b54bf61b 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/TestRestCodec.java @@ -22,8 +22,8 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.param.ParamValueProcessor; import org.apache.servicecomb.common.rest.codec.param.RestClientRequestImpl; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java index 2db296e4d14..b7c810050a5 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestBodyProcessor.java @@ -23,9 +23,9 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.RestClientRequest; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java index ffe1e36f0df..10cad81b4f4 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestCookieProcessor.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java index 2b7e233e757..f1931f2f083 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestFormProcessor.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.RestClientRequest; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java index 4058f045edc..cbb4e657c1d 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestHeaderProcessor.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.RestClientRequest; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java index 39bbb21770a..ff8218768cf 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestPathProcessor.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.param.PathProcessorCreator.PathProcessor; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java index 8683ef108ff..fd896fa1bf3 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessor.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.common.rest.codec.param; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor; import org.hamcrest.MatcherAssert; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java index f7387db4c57..1f86b1b4e01 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestQueryProcessorCreator.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.common.rest.codec.param; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor; import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java index 70e3f4bddf7..cd97678dc69 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/param/TestRestClientRequestImpl.java @@ -21,9 +21,9 @@ import java.util.Arrays; import java.util.UUID; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java index 5865a2b4c8e..79da0a64afb 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/codec/query/QueryCodecTestBase.java @@ -18,7 +18,7 @@ import static org.assertj.core.api.Assertions.assertThat; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor; import org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java index 30e62790959..558378b09a3 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/definition/TestRestOperationMeta.java @@ -22,12 +22,12 @@ import java.io.File; import java.util.Arrays; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessorManager; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java index 2d74c468dc7..0db6c02c031 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/RestServerCodecFilterTest.java @@ -19,7 +19,7 @@ import static com.google.common.net.HttpHeaders.CONTENT_LENGTH; import static com.google.common.net.HttpHeaders.TRANSFER_ENCODING; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.assertj.core.api.Assertions.assertThat; import java.util.ArrayList; @@ -58,7 +58,7 @@ import org.junit.jupiter.api.Test; import org.mockito.Mockito; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; public class RestServerCodecFilterTest { final RestServerCodecFilter codecFilter = new RestServerCodecFilter(); diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java index b1cef1a617f..cdc9946ea46 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/filter/inner/TestServerRestArgsFilter.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.common.rest.filter.inner; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestPathSchema.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestPathSchema.java index 66e7f4a8a66..b0de6caf78b 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestPathSchema.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/locator/TestPathSchema.java @@ -16,10 +16,10 @@ */ package org.apache.servicecomb.common.rest.locator; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; @Path("/") public class TestPathSchema { diff --git a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java index a48aa291abf..4a17c845185 100644 --- a/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java +++ b/common/common-rest/src/test/java/org/apache/servicecomb/common/rest/resource/TestClassPathStaticResourceHandler.java @@ -20,9 +20,9 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace; diff --git a/common/pom.xml b/common/pom.xml index 09650f3bf96..0a9957e4255 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default common diff --git a/core/pom.xml b/core/pom.xml index f4d655750b4..c2ce4e8eaa8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default java-chassis-core diff --git a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java index 0b0b24076df..e38e68e9eb8 100644 --- a/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java +++ b/core/src/main/java/org/apache/servicecomb/core/SCBEngine.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicLong; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.config.ConfigUtil; diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/InvocationRuntimeType.java b/core/src/main/java/org/apache/servicecomb/core/definition/InvocationRuntimeType.java index 84351047b94..356201b70d7 100644 --- a/core/src/main/java/org/apache/servicecomb/core/definition/InvocationRuntimeType.java +++ b/core/src/main/java/org/apache/servicecomb/core/definition/InvocationRuntimeType.java @@ -19,7 +19,7 @@ import java.lang.reflect.Method; import java.lang.reflect.Type; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.arguments.ArgumentsMapper; import org.apache.servicecomb.swagger.invocation.response.ResponsesMeta; diff --git a/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java b/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java index 9b7b563202d..696199b64fc 100644 --- a/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java +++ b/core/src/main/java/org/apache/servicecomb/core/definition/ServiceRegistryListener.java @@ -21,7 +21,7 @@ import static org.apache.servicecomb.core.definition.CoreMetaUtils.CORE_MICROSERVICE_VERSIONS_META; import static org.apache.servicecomb.core.definition.CoreMetaUtils.getMicroserviceVersionsMeta; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.SCBEngine; import org.apache.servicecomb.foundation.common.event.EnableExceptionPropagation; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/DefaultExceptionProcessor.java b/core/src/main/java/org/apache/servicecomb/core/exception/DefaultExceptionProcessor.java index 0b458a32c07..545e8a9af9e 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/DefaultExceptionProcessor.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/DefaultExceptionProcessor.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.core.exception; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import static javax.ws.rs.core.Response.Status.TOO_MANY_REQUESTS; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.TOO_MANY_REQUESTS; import static org.apache.commons.lang3.exception.ExceptionUtils.getStackTrace; import static org.apache.servicecomb.core.exception.ExceptionCodes.GENERIC_SERVER; import static org.apache.servicecomb.swagger.invocation.InvocationType.CONSUMER; @@ -29,9 +29,9 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.config.inject.InjectProperties; import org.apache.servicecomb.config.inject.InjectProperty; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionConverter.java index eedfa432523..624cf805c0a 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionConverter.java @@ -16,12 +16,12 @@ */ package org.apache.servicecomb.core.exception; -import static javax.ws.rs.core.Response.Status.Family.CLIENT_ERROR; +import static jakarta.ws.rs.core.Response.Status.Family.CLIENT_ERROR; import static org.apache.servicecomb.core.exception.ExceptionCodes.GENERIC_CLIENT; import static org.apache.servicecomb.core.exception.ExceptionCodes.GENERIC_SERVER; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.foundation.common.utils.SPIOrder; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionProcessor.java b/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionProcessor.java index 859c7a71daa..3ebe4006282 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionProcessor.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/ExceptionProcessor.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.core.exception; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/Exceptions.java b/core/src/main/java/org/apache/servicecomb/core/exception/Exceptions.java index 6a049b088fa..bf8923f03d5 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/Exceptions.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/Exceptions.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.core.exception; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.apache.servicecomb.core.exception.ExceptionCodes.GENERIC_CLIENT; import static org.apache.servicecomb.core.exception.ExceptionCodes.GENERIC_SERVER; import static org.apache.servicecomb.swagger.invocation.InvocationType.CONSUMER; @@ -26,9 +26,9 @@ import java.util.Comparator; import java.util.List; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/IllegalArgumentExceptionToProducerResponseConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/IllegalArgumentExceptionToProducerResponseConverter.java index c3c8d2e9f84..532c38b630f 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/IllegalArgumentExceptionToProducerResponseConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/IllegalArgumentExceptionToProducerResponseConverter.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.exception; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/ThrowableExceptionToProducerResponseConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/ThrowableExceptionToProducerResponseConverter.java index 4ffa2ec9e99..501846426de 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/ThrowableExceptionToProducerResponseConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/ThrowableExceptionToProducerResponseConverter.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.exception; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConnectTimeoutExceptionConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConnectTimeoutExceptionConverter.java index 961eb4f477d..5bf6cddaff6 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConnectTimeoutExceptionConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConnectTimeoutExceptionConverter.java @@ -16,10 +16,10 @@ */ package org.apache.servicecomb.core.exception.converter; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.ExceptionConverter; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConstraintViolationExceptionConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConstraintViolationExceptionConverter.java index c2e08344ef4..6b40b294526 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConstraintViolationExceptionConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/converter/ConstraintViolationExceptionConverter.java @@ -16,14 +16,14 @@ */ package org.apache.servicecomb.core.exception.converter; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.apache.servicecomb.core.exception.ExceptionCodes.DEFAULT_VALIDATE; import java.util.List; import java.util.stream.Collectors; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response.StatusType; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.ExceptionConverter; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/converter/DefaultExceptionConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/converter/DefaultExceptionConverter.java index b48bdb4e609..ed3bf3fd131 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/converter/DefaultExceptionConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/converter/DefaultExceptionConverter.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.core.exception.converter; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.ExceptionConverter; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/converter/IllegalArgumentExceptionConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/converter/IllegalArgumentExceptionConverter.java index 8725ce13679..8ea29491dc8 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/converter/IllegalArgumentExceptionConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/converter/IllegalArgumentExceptionConverter.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.core.exception.converter; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.ExceptionConverter; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/converter/InvocationExceptionConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/converter/InvocationExceptionConverter.java index 0a7d2714b79..2bb80eeb4b8 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/converter/InvocationExceptionConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/converter/InvocationExceptionConverter.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.core.exception.converter; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.ExceptionConverter; diff --git a/core/src/main/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverter.java b/core/src/main/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverter.java index 0059e7f4fe5..a7e2eff41ff 100644 --- a/core/src/main/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverter.java +++ b/core/src/main/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverter.java @@ -16,12 +16,12 @@ */ package org.apache.servicecomb.core.exception.converter; -import static javax.ws.rs.core.Response.Status.REQUEST_TIMEOUT; +import static jakarta.ws.rs.core.Response.Status.REQUEST_TIMEOUT; import java.util.concurrent.TimeoutException; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.ExceptionConverter; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/ConsumerFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/ConsumerFilter.java index 2ede1f02503..ffe8dc01ab9 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/ConsumerFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/ConsumerFilter.java @@ -19,7 +19,7 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.swagger.invocation.InvocationType; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/Filter.java b/core/src/main/java/org/apache/servicecomb/core/filter/Filter.java index 6ea36313214..adcb3f4ffb0 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/Filter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/Filter.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.provider.consumer.InvokerUtils; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/ProducerFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/ProducerFilter.java index 969e4252f67..5e590deccbf 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/ProducerFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/ProducerFilter.java @@ -19,7 +19,7 @@ import java.util.Collections; import java.util.List; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.swagger.invocation.InvocationType; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/EmptyFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/EmptyFilter.java index 95da754bc78..475eefdab46 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/EmptyFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/EmptyFilter.java @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.filter.FilterNode; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java index a6a0a22c45a..a6e90ef0756 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilter.java @@ -20,14 +20,14 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; -import javax.validation.Configuration; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.validation.executable.ExecutableValidator; -import javax.validation.groups.Default; +import jakarta.annotation.Nonnull; +import jakarta.validation.Configuration; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.executable.ExecutableValidator; +import jakarta.validation.groups.Default; import org.apache.servicecomb.config.ConfigUtil; import org.apache.servicecomb.core.Invocation; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilter.java index cb06081f5c2..17226e0baa6 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilter.java @@ -19,7 +19,7 @@ import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.Exceptions; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ScheduleFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ScheduleFilter.java index e144d81f091..6cda31a8b30 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ScheduleFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ScheduleFilter.java @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.Executor; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.Exceptions; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilter.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilter.java index aa797caa010..6ca0c274774 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilter.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/SimpleLoadBalanceFilter.java @@ -23,7 +23,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicInteger; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Endpoint; import org.apache.servicecomb.core.Invocation; diff --git a/core/src/main/java/org/apache/servicecomb/core/filter/impl/TransportFilters.java b/core/src/main/java/org/apache/servicecomb/core/filter/impl/TransportFilters.java index 0b9f145d922..ba836ec9e16 100644 --- a/core/src/main/java/org/apache/servicecomb/core/filter/impl/TransportFilters.java +++ b/core/src/main/java/org/apache/servicecomb/core/filter/impl/TransportFilters.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.filter.FilterNode; diff --git a/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombCircuitBreakerExtension.java b/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombCircuitBreakerExtension.java index 021a7fd110a..e3ec654c7e0 100644 --- a/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombCircuitBreakerExtension.java +++ b/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombCircuitBreakerExtension.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.governance; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.governance.handler.ext.AbstractCircuitBreakerExtension; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombRetryExtension.java b/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombRetryExtension.java index c47866a8fb0..58ae2ae1a7d 100644 --- a/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombRetryExtension.java +++ b/core/src/main/java/org/apache/servicecomb/core/governance/ServiceCombRetryExtension.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.governance; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.governance.handler.ext.AbstractRetryExtension; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationTimeoutStrategy.java b/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationTimeoutStrategy.java index 5e31c59136c..24b48619d2c 100644 --- a/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationTimeoutStrategy.java +++ b/core/src/main/java/org/apache/servicecomb/core/invocation/InvocationTimeoutStrategy.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.invocation; -import static javax.ws.rs.core.Response.Status.REQUEST_TIMEOUT; +import static jakarta.ws.rs.core.Response.Status.REQUEST_TIMEOUT; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.ExceptionCodes; diff --git a/core/src/main/java/org/apache/servicecomb/core/provider/consumer/InvokerUtils.java b/core/src/main/java/org/apache/servicecomb/core/provider/consumer/InvokerUtils.java index 2e4c0603a52..2defda246e9 100644 --- a/core/src/main/java/org/apache/servicecomb/core/provider/consumer/InvokerUtils.java +++ b/core/src/main/java/org/apache/servicecomb/core/provider/consumer/InvokerUtils.java @@ -32,8 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Supplier; -import javax.annotation.Nonnull; -import javax.ws.rs.core.Response.Status; +import jakarta.annotation.Nonnull; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.HttpStatus; import org.apache.servicecomb.core.Invocation; diff --git a/core/src/main/java/org/apache/servicecomb/core/provider/consumer/SyncResponseExecutor.java b/core/src/main/java/org/apache/servicecomb/core/provider/consumer/SyncResponseExecutor.java index 228f21f53a3..8e86d9d7f90 100644 --- a/core/src/main/java/org/apache/servicecomb/core/provider/consumer/SyncResponseExecutor.java +++ b/core/src/main/java/org/apache/servicecomb/core/provider/consumer/SyncResponseExecutor.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.provider.consumer; -import static javax.ws.rs.core.Response.Status.REQUEST_TIMEOUT; +import static jakarta.ws.rs.core.Response.Status.REQUEST_TIMEOUT; import java.util.concurrent.CountDownLatch; import java.util.concurrent.Executor; diff --git a/core/src/test/java/org/apache/servicecomb/core/TestConfig.java b/core/src/test/java/org/apache/servicecomb/core/TestConfig.java index 02f8200d808..05a6e731c1c 100644 --- a/core/src/test/java/org/apache/servicecomb/core/TestConfig.java +++ b/core/src/test/java/org/apache/servicecomb/core/TestConfig.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java b/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java index 1ff9aab9c66..893b65f0245 100644 --- a/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/exception/ExceptionsTest.java @@ -17,14 +17,14 @@ package org.apache.servicecomb.core.exception; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.assertj.core.api.Assertions.assertThat; import java.util.Collections; -import javax.annotation.Nullable; -import javax.ws.rs.core.Response.StatusType; +import jakarta.annotation.Nullable; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace; diff --git a/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java b/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java index 4de741c5118..d060e299e3d 100644 --- a/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/exception/converter/TimeoutExceptionConverterTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.TimeoutException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.exception.Exceptions; import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector; diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/SimpleRetryFilter.java b/core/src/test/java/org/apache/servicecomb/core/filter/SimpleRetryFilter.java index ce54faf12c3..24626aa699e 100644 --- a/core/src/test/java/org/apache/servicecomb/core/filter/SimpleRetryFilter.java +++ b/core/src/test/java/org/apache/servicecomb/core/filter/SimpleRetryFilter.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.Exceptions; diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java index f08b89176bd..26d2472da03 100644 --- a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ParameterValidatorFilterTest.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.filter.impl; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.apache.servicecomb.core.exception.ExceptionCodes.DEFAULT_VALIDATE; import static org.apache.servicecomb.core.exception.converter.ConstraintViolationExceptionConverter.KEY_CODE; import static org.assertj.core.api.Assertions.assertThat; @@ -25,9 +25,9 @@ import java.util.List; -import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; import org.apache.commons.lang3.reflect.MethodUtils; import org.apache.servicecomb.core.Invocation; diff --git a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java index 58a6ea0d103..1e39ede80dc 100644 --- a/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java +++ b/core/src/test/java/org/apache/servicecomb/core/filter/impl/ProducerOperationFilterTest.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.core.filter.impl; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.catchThrowable; @@ -188,12 +188,20 @@ public void should_unify_IllegalArgumentException_message_when_convert_exception } }; CompletableFuture future = filter.onFilter(invocation, FilterNode.EMPTY); - - assertThat(future) - .failsWithin(Duration.ofSeconds(1)) - .withThrowableOfType(ExecutionException.class) - .withCauseExactlyInstanceOf(IllegalArgumentException.class) - .withMessage("java.lang.IllegalArgumentException: wrong number of arguments"); + String version = System.getProperty("java.version"); + if (version != null && version.contains("21")) { + assertThat(future) + .failsWithin(Duration.ofSeconds(1)) + .withThrowableOfType(ExecutionException.class) + .withCauseExactlyInstanceOf(IllegalArgumentException.class) + .withMessage("java.lang.IllegalArgumentException: wrong number of arguments: 1 expected: 0"); + } else { + assertThat(future) + .failsWithin(Duration.ofSeconds(1)) + .withThrowableOfType(ExecutionException.class) + .withCauseExactlyInstanceOf(IllegalArgumentException.class) + .withMessage("java.lang.IllegalArgumentException: wrong number of arguments"); + } InvocationException throwable = Exceptions .convert(invocation, catchThrowable(future::get), INTERNAL_SERVER_ERROR); diff --git a/core/src/test/java/org/apache/servicecomb/core/handler/impl/ErrorToProducerResponseConverter.java b/core/src/test/java/org/apache/servicecomb/core/handler/impl/ErrorToProducerResponseConverter.java index 373d7d82282..ab537d82417 100644 --- a/core/src/test/java/org/apache/servicecomb/core/handler/impl/ErrorToProducerResponseConverter.java +++ b/core/src/test/java/org/apache/servicecomb/core/handler/impl/ErrorToProducerResponseConverter.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.core.handler.impl; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/core/src/test/java/org/apache/servicecomb/core/handler/impl/TestProducerOperationHandler.java b/core/src/test/java/org/apache/servicecomb/core/handler/impl/TestProducerOperationHandler.java index cafb890728a..6b842bdac56 100644 --- a/core/src/test/java/org/apache/servicecomb/core/handler/impl/TestProducerOperationHandler.java +++ b/core/src/test/java/org/apache/servicecomb/core/handler/impl/TestProducerOperationHandler.java @@ -19,7 +19,7 @@ import java.lang.reflect.InvocationTargetException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/coverage-reports/pom.xml b/coverage-reports/pom.xml index 939661403d3..82cc288dd69 100644 --- a/coverage-reports/pom.xml +++ b/coverage-reports/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/demo/demo-crossapp/crossapp-client/pom.xml b/demo/demo-crossapp/crossapp-client/pom.xml index 73d7375cd5c..b7be468ae48 100644 --- a/demo/demo-crossapp/crossapp-client/pom.xml +++ b/demo/demo-crossapp/crossapp-client/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-crossapp - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT crossapp-client Java Chassis::Demo::CrossApp::Client diff --git a/demo/demo-crossapp/crossapp-server/pom.xml b/demo/demo-crossapp/crossapp-server/pom.xml index 15d04177e7e..a3974653797 100644 --- a/demo/demo-crossapp/crossapp-server/pom.xml +++ b/demo/demo-crossapp/crossapp-server/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-crossapp - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT crossapp-server Java Chassis::Demo::CrossApp::Server diff --git a/demo/demo-crossapp/pom.xml b/demo/demo-crossapp/pom.xml index aba9762e920..b0b246d449f 100644 --- a/demo/demo-crossapp/pom.xml +++ b/demo/demo-crossapp/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-crossapp Java Chassis::Demo::CrossApp diff --git a/demo/demo-cse-v1/consumer/pom.xml b/demo/demo-cse-v1/consumer/pom.xml index 3a2760f805f..ab4b58c9dc1 100644 --- a/demo/demo-cse-v1/consumer/pom.xml +++ b/demo/demo-cse-v1/consumer/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-cse-v1 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v1-consumer diff --git a/demo/demo-cse-v1/gateway/pom.xml b/demo/demo-cse-v1/gateway/pom.xml index bf5834aba4b..62a8c0c9b55 100644 --- a/demo/demo-cse-v1/gateway/pom.xml +++ b/demo/demo-cse-v1/gateway/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-cse-v1 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v1-gateway diff --git a/demo/demo-cse-v1/pom.xml b/demo/demo-cse-v1/pom.xml index 93bf2675a19..08d3110bc1c 100644 --- a/demo/demo-cse-v1/pom.xml +++ b/demo/demo-cse-v1/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-cse-v1 Java Chassis::Demo::CSE-V1 diff --git a/demo/demo-cse-v1/provider-canary/pom.xml b/demo/demo-cse-v1/provider-canary/pom.xml index ae0162a301d..24a17da8af6 100644 --- a/demo/demo-cse-v1/provider-canary/pom.xml +++ b/demo/demo-cse-v1/provider-canary/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-cse-v1 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v1-provider-canary diff --git a/demo/demo-cse-v1/provider/pom.xml b/demo/demo-cse-v1/provider/pom.xml index a6daf4aa086..c05099282c9 100644 --- a/demo/demo-cse-v1/provider/pom.xml +++ b/demo/demo-cse-v1/provider/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-cse-v1 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v1-provider diff --git a/demo/demo-cse-v1/test-client/pom.xml b/demo/demo-cse-v1/test-client/pom.xml index b916d934fa5..d6bedd4eb41 100644 --- a/demo/demo-cse-v1/test-client/pom.xml +++ b/demo/demo-cse-v1/test-client/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-cse-v1 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v1-test-client diff --git a/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java b/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java index e0f4d3d6610..a5c3dd67401 100644 --- a/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java +++ b/demo/demo-cse-v1/test-client/src/main/java/org/apache/servicecomb/samples/HelloWorldIT.java @@ -119,8 +119,7 @@ private void testHelloWorldNoHeader() { } } - double ratio = oldCount / (float) (oldCount + newCount); - TestMgr.check(ratio == 0.5, true); + TestMgr.check(oldCount == newCount, true); } private void testHelloWorldEmptyProtectionCloseWeight100() { diff --git a/demo/demo-cse-v2/consumer/pom.xml b/demo/demo-cse-v2/consumer/pom.xml index ba9176cb566..cfbf2987367 100644 --- a/demo/demo-cse-v2/consumer/pom.xml +++ b/demo/demo-cse-v2/consumer/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-cse-v2 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v2-consumer @@ -33,6 +33,20 @@ org.apache.servicecomb java-chassis-spring-boot-starter-standalone + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/demo/demo-cse-v2/gateway/pom.xml b/demo/demo-cse-v2/gateway/pom.xml index 30f197b589a..3dc9ed6c3ca 100644 --- a/demo/demo-cse-v2/gateway/pom.xml +++ b/demo/demo-cse-v2/gateway/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-cse-v2 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v2-gateway diff --git a/demo/demo-cse-v2/pom.xml b/demo/demo-cse-v2/pom.xml index cec5a5057e1..b203590d927 100644 --- a/demo/demo-cse-v2/pom.xml +++ b/demo/demo-cse-v2/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-cse-v2 Java Chassis::Demo::CSE-V2 diff --git a/demo/demo-cse-v2/provider/pom.xml b/demo/demo-cse-v2/provider/pom.xml index fa791f340a9..c5b57816f28 100644 --- a/demo/demo-cse-v2/provider/pom.xml +++ b/demo/demo-cse-v2/provider/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-cse-v2 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v2-provider @@ -37,6 +37,20 @@ org.apache.servicecomb java-chassis-spring-boot-starter-standalone + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + diff --git a/demo/demo-cse-v2/test-client/pom.xml b/demo/demo-cse-v2/test-client/pom.xml index a33825187d2..9797e8e2ee4 100644 --- a/demo/demo-cse-v2/test-client/pom.xml +++ b/demo/demo-cse-v2/test-client/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-cse-v2 - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT cse-v2-test-client diff --git a/demo/demo-edge/authentication/pom.xml b/demo/demo-edge/authentication/pom.xml index b09764458ef..becf9963fa5 100644 --- a/demo/demo-edge/authentication/pom.xml +++ b/demo/demo-edge/authentication/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.demo demo-edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT authentication Java Chassis::Demo::Edge::Authentication diff --git a/demo/demo-edge/business-1-1-0/pom.xml b/demo/demo-edge/business-1-1-0/pom.xml index 391e8821cba..25ade577e81 100644 --- a/demo/demo-edge/business-1-1-0/pom.xml +++ b/demo/demo-edge/business-1-1-0/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.demo demo-edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT business-1-1-0 Java Chassis::Demo::Edge::Business 1.1.0 diff --git a/demo/demo-edge/business-1.0.0/pom.xml b/demo/demo-edge/business-1.0.0/pom.xml index 46ea333bbc8..02686c02505 100644 --- a/demo/demo-edge/business-1.0.0/pom.xml +++ b/demo/demo-edge/business-1.0.0/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT business-1-0-0 Java Chassis::Demo::Edge::Business 1.0.0 diff --git a/demo/demo-edge/business-2.0.0/pom.xml b/demo/demo-edge/business-2.0.0/pom.xml index 1dab55c0328..d93b63f68a3 100644 --- a/demo/demo-edge/business-2.0.0/pom.xml +++ b/demo/demo-edge/business-2.0.0/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT business-2-0-0 Java Chassis::Demo::Edge::Business 2.0.0 diff --git a/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToProducerResponseConverter.java b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToProducerResponseConverter.java index 9894b6d37b7..c6580594dd0 100644 --- a/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToProducerResponseConverter.java +++ b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/CustomExceptionToProducerResponseConverter.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.edge.business.error; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/ErrorService.java b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/ErrorService.java index 8bdba9c2bc3..f4b56e58782 100644 --- a/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/ErrorService.java +++ b/demo/demo-edge/business-2.0.0/src/main/java/org/apache/servicecomb/demo/edge/business/error/ErrorService.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.edge.business.error; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; diff --git a/demo/demo-edge/consumer/pom.xml b/demo/demo-edge/consumer/pom.xml index c3cf73e5d90..b83be3df2a5 100644 --- a/demo/demo-edge/consumer/pom.xml +++ b/demo/demo-edge/consumer/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT consumer Java Chassis::Demo::Edge::Consumer diff --git a/demo/demo-edge/edge-service/pom.xml b/demo/demo-edge/edge-service/pom.xml index 59f27e76ee1..e381decd12e 100644 --- a/demo/demo-edge/edge-service/pom.xml +++ b/demo/demo-edge/edge-service/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.demo demo-edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT edge-service Java Chassis::Demo::Edge::Service diff --git a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/handler/AuthHandler.java b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/handler/AuthHandler.java index 256418ff59d..bdfeb904614 100644 --- a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/handler/AuthHandler.java +++ b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/handler/AuthHandler.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.edge.service.handler; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.Handler; import org.apache.servicecomb.core.Invocation; diff --git a/demo/demo-edge/model/pom.xml b/demo/demo-edge/model/pom.xml index bbf2bf2dfe8..0b9f01513a9 100644 --- a/demo/demo-edge/model/pom.xml +++ b/demo/demo-edge/model/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT model Java Chassis::Demo::Edge::Model diff --git a/demo/demo-edge/pom.xml b/demo/demo-edge/pom.xml index ea4058dcf59..bc921649f0f 100644 --- a/demo/demo-edge/pom.xml +++ b/demo/demo-edge/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-edge Java Chassis::Demo::Edge diff --git a/demo/demo-filter/filter-client/pom.xml b/demo/demo-filter/filter-client/pom.xml index f198d94711e..fd718bd3a82 100644 --- a/demo/demo-filter/filter-client/pom.xml +++ b/demo/demo-filter/filter-client/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-filter - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT filter-client Java Chassis::Demo::Filter::Client diff --git a/demo/demo-filter/filter-server/pom.xml b/demo/demo-filter/filter-server/pom.xml index 67cc6eb0db6..01b40a129dd 100644 --- a/demo/demo-filter/filter-server/pom.xml +++ b/demo/demo-filter/filter-server/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-filter - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT filter-server Java Chassis::Demo::Filter::Server diff --git a/demo/demo-filter/filter-server/src/main/java/org/apache/servicecomb/demo/filter/retry/RetrySchema.java b/demo/demo-filter/filter-server/src/main/java/org/apache/servicecomb/demo/filter/retry/RetrySchema.java index 27e72f5ea80..8ea350a4982 100644 --- a/demo/demo-filter/filter-server/src/main/java/org/apache/servicecomb/demo/filter/retry/RetrySchema.java +++ b/demo/demo-filter/filter-server/src/main/java/org/apache/servicecomb/demo/filter/retry/RetrySchema.java @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicLong; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; diff --git a/demo/demo-filter/pom.xml b/demo/demo-filter/pom.xml index 5fd34fe76b3..fce76254f51 100644 --- a/demo/demo-filter/pom.xml +++ b/demo/demo-filter/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-filter Java Chassis::Demo::Filter diff --git a/demo/demo-jaxrs/jaxrs-client/pom.xml b/demo/demo-jaxrs/jaxrs-client/pom.xml index 7c11eb8603b..0828defeb71 100644 --- a/demo/demo-jaxrs/jaxrs-client/pom.xml +++ b/demo/demo-jaxrs/jaxrs-client/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-jaxrs - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT jaxrs-client Java Chassis::Demo::JAXRS::Client diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java index 93e086c279d..0a21b4929d6 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java +++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/JaxrsClient.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.HttpStatus; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java index 299c4ec72c9..bac97fe559e 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java +++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/CodeFirstRestTemplateJaxrs.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.FileUtils; import org.apache.servicecomb.demo.CodeFirstRestTemplate; @@ -118,6 +118,6 @@ private void test404(RestTemplate template) { } } TestMgr.check(404, exception.getRawStatusCode()); - TestMgr.check("404 Not Found: \"{\"message\":\"Not Found\"}\"", exception.getMessage()); + TestMgr.check("404 Not Found on GET request for \"http://127.0.0.1:8080/aPathNotExist\": \"{\"message\":\"Not Found\"}\"", exception.getMessage()); } } diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java index 4b2d0d2c872..fde82068315 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java +++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/MultiErrorCodeServiceClient.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.demo.CategorizedTestCase; diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java index 415731840b3..d36bc0cfa05 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java +++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java @@ -19,7 +19,7 @@ import java.util.ArrayList; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.demo.TestMgr; import org.apache.servicecomb.demo.jaxrs.server.validation.ValidationModel; diff --git a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java index 6c4350a07f4..ea5c2072ff5 100644 --- a/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java +++ b/demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.demo.jaxrs.server.pojoDefault; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Null; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Null; public class DefaultResponseModel { @Min(20) diff --git a/demo/demo-jaxrs/jaxrs-server/pom.xml b/demo/demo-jaxrs/jaxrs-server/pom.xml index a45d3ba35cd..086789edad3 100644 --- a/demo/demo-jaxrs/jaxrs-server/pom.xml +++ b/demo/demo-jaxrs/jaxrs-server/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-jaxrs - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT jaxrs-server Java Chassis::Demo::JAXRS::Server diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java index 81e350f7b35..7d82b5bf252 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/CodeFirstJaxrs.java @@ -25,22 +25,22 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ComputeImpl.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ComputeImpl.java index af5a2774d5a..f3a63af4d3e 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ComputeImpl.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ComputeImpl.java @@ -20,19 +20,19 @@ import java.nio.charset.StandardCharsets; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.demo.compute.Person; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/FormRequestSchema.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/FormRequestSchema.java index 2a62049f1e8..fad381fdd7c 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/FormRequestSchema.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/FormRequestSchema.java @@ -17,12 +17,12 @@ package org.apache.servicecomb.demo.jaxrs.server; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java index 5a2788e648b..17769d3c291 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/JaxRSDefaultValues.java @@ -16,21 +16,21 @@ */ package org.apache.servicecomb.demo.jaxrs.server; -import javax.servlet.http.HttpServletRequest; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.ws.rs.Consumes; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamSchema.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamSchema.java index a15ce1b34bf..80985d68541 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamSchema.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamSchema.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.demo.jaxrs.server; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java index d63b313f60b..70ccff6b365 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/QueryParamWithListSchema.java @@ -19,9 +19,9 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ReactiveSchema.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ReactiveSchema.java index 284c1b6a8db..f8fafff303f 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ReactiveSchema.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/ReactiveSchema.java @@ -17,11 +17,11 @@ package org.apache.servicecomb.demo.jaxrs.server; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/RequestClientTimeOut.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/RequestClientTimeOut.java index 387165123d6..2f17c2fc6f8 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/RequestClientTimeOut.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/RequestClientTimeOut.java @@ -17,11 +17,11 @@ package org.apache.servicecomb.demo.jaxrs.server; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.demo.validator.Student; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrs.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrs.java index 8546d2c25eb..c9c9b311535 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrs.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/SchemeInterfaceJaxrs.java @@ -17,11 +17,11 @@ package org.apache.servicecomb.demo.jaxrs.server; -import javax.validation.constraints.Min; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.springframework.data.domain.Page; import org.springframework.web.bind.annotation.RequestParam; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/Validator.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/Validator.java index 9f5bef60ae6..a5c5f9b8332 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/Validator.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/Validator.java @@ -17,15 +17,15 @@ package org.apache.servicecomb.demo.jaxrs.server; -import javax.validation.Valid; -import javax.validation.constraints.Min; -import javax.ws.rs.FormParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.validation.Valid; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.demo.validator.Student; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/BeanParamTestService.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/BeanParamTestService.java index 1e2a040bc62..8f037cff595 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/BeanParamTestService.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/BeanParamTestService.java @@ -20,15 +20,15 @@ import java.io.IOException; import java.util.Scanner; -import javax.servlet.http.Part; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.swagger.invocation.context.ContextUtils; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java index 489b29c567d..3ccff412a5e 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameter.java @@ -17,11 +17,11 @@ package org.apache.servicecomb.demo.jaxrs.server.beanParam; -import javax.ws.rs.CookieParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java index 80530aba63d..b6e3685ef47 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/beanParam/TestBeanParameterWithUpload.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.demo.jaxrs.server.beanParam; -import javax.servlet.http.Part; -import javax.ws.rs.FormParam; -import javax.ws.rs.QueryParam; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.QueryParam; public class TestBeanParameterWithUpload { @QueryParam("query") diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/injectBean/InjectBeanSchema.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/injectBean/InjectBeanSchema.java index 14f2ee4c701..59395b02687 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/injectBean/InjectBeanSchema.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/injectBean/InjectBeanSchema.java @@ -19,8 +19,8 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/multiErrorCode/MultiErrorCodeService.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/multiErrorCode/MultiErrorCodeService.java index 7f76e6ac645..8c7d48fd22b 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/multiErrorCode/MultiErrorCodeService.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/multiErrorCode/MultiErrorCodeService.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.List; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.demo.multiErrorCode.MultiRequest; import org.apache.servicecomb.demo.multiErrorCode.MultiResponse200; @@ -51,12 +51,12 @@ public MultiResponse200 errorCode(MultiRequest request) { MultiResponse400 r = new MultiResponse400(); r.setCode(400); r.setMessage("bad request"); - throw new InvocationException(javax.ws.rs.core.Response.Status.BAD_REQUEST, r); + throw new InvocationException(jakarta.ws.rs.core.Response.Status.BAD_REQUEST, r); } else if (request.getCode() == 500) { MultiResponse500 r = new MultiResponse500(); r.setCode(500); r.setMessage("internal error"); - throw new InvocationException(javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR, r); + throw new InvocationException(jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR, r); } else { MultiResponse200 r = new MultiResponse200(); r.setCode(200); @@ -110,15 +110,15 @@ public Response errorCodeWithHeader(MultiRequest request) { @ApiResponse(code = 400, response = MultiResponse400.class, message = ""), @ApiResponse(code = 500, response = MultiResponse500.class, message = "")}) @ResponseHeaders({@ResponseHeader(name = "x-code", response = String.class)}) - public javax.ws.rs.core.Response errorCodeWithHeaderJAXRS(MultiRequest request) { - javax.ws.rs.core.Response response; + public jakarta.ws.rs.core.Response errorCodeWithHeaderJAXRS(MultiRequest request) { + jakarta.ws.rs.core.Response response; if (request.getCode() == 400) { MultiResponse400 r = new MultiResponse400(); r.setCode(request.getCode()); r.setMessage(request.getMessage()); // If got many types for different status code, we can only using InvocationException for failed error code like 400-500. // The result for Failed Family(e.g. 400-500), can not set return value as target type directly or will give exception. - response = javax.ws.rs.core.Response.status(Status.BAD_REQUEST) + response = jakarta.ws.rs.core.Response.status(Status.BAD_REQUEST) .entity(new InvocationException(Status.BAD_REQUEST, r)) .header("x-code", "400") .build(); @@ -126,7 +126,7 @@ public javax.ws.rs.core.Response errorCodeWithHeaderJAXRS(MultiRequest request) MultiResponse500 r = new MultiResponse500(); r.setCode(request.getCode()); r.setMessage(request.getMessage()); - response = javax.ws.rs.core.Response.status(Status.INTERNAL_SERVER_ERROR) + response = jakarta.ws.rs.core.Response.status(Status.INTERNAL_SERVER_ERROR) .entity(new InvocationException(Status.INTERNAL_SERVER_ERROR, r)) .header("x-code", "500") .build(); @@ -135,7 +135,7 @@ public javax.ws.rs.core.Response errorCodeWithHeaderJAXRS(MultiRequest request) r.setCode(request.getCode()); r.setMessage(request.getMessage()); // If error code is OK family(like 200), we can use the target type. - response = javax.ws.rs.core.Response.status(Status.OK) + response = jakarta.ws.rs.core.Response.status(Status.OK) .entity(r) .header("x-code", "200") .build(); diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultModelService.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultModelService.java index 7296a0970e1..36020868cbd 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultModelService.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultModelService.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.demo.jaxrs.server.pojoDefault; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultRequestModel.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultRequestModel.java index 0cc535703df..b8053ca8086 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultRequestModel.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultRequestModel.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.demo.jaxrs.server.pojoDefault; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Null; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Null; public class DefaultRequestModel { @Min(20) diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java index bf4288a2869..9c505699866 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/pojoDefault/DefaultResponseModel.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.demo.jaxrs.server.pojoDefault; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.Null; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Null; public class DefaultResponseModel { @Min(20) diff --git a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java index 4b4620375b0..7b18a4f7322 100644 --- a/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java +++ b/demo/demo-jaxrs/jaxrs-server/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationService.java @@ -17,13 +17,13 @@ package org.apache.servicecomb.demo.jaxrs.server.validation; -import javax.validation.Valid; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.apache.servicecomb.demo.validator.Teacher; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-jaxrs/pom.xml b/demo/demo-jaxrs/pom.xml index 358bb557a7d..37336fbc795 100644 --- a/demo/demo-jaxrs/pom.xml +++ b/demo/demo-jaxrs/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-jaxrs Java Chassis::Demo::JAXRS diff --git a/demo/demo-local-registry/demo-local-registry-client/pom.xml b/demo/demo-local-registry/demo-local-registry-client/pom.xml index 0ba6629328c..6ebee831acc 100644 --- a/demo/demo-local-registry/demo-local-registry-client/pom.xml +++ b/demo/demo-local-registry/demo-local-registry-client/pom.xml @@ -25,17 +25,13 @@ org.apache.servicecomb.demo demo-local-registry - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.demo.localRegistryClient.Application - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb.demo demo-schema diff --git a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/CodeFirstService.java b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/CodeFirstService.java index cbe329eb9d2..05973bd18de 100644 --- a/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/CodeFirstService.java +++ b/demo/demo-local-registry/demo-local-registry-client/src/main/java/org/apache/servicecomb/demo/localRegistryClient/CodeFirstService.java @@ -17,10 +17,10 @@ package org.apache.servicecomb.demo.localRegistryClient; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; @Path("/register/url/codeFirst") @Produces("application/json") diff --git a/demo/demo-local-registry/demo-local-registry-server/pom.xml b/demo/demo-local-registry/demo-local-registry-server/pom.xml index 9c1d187b96e..3a0e6bfbf5d 100644 --- a/demo/demo-local-registry/demo-local-registry-server/pom.xml +++ b/demo/demo-local-registry/demo-local-registry-server/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-local-registry - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -36,10 +36,6 @@ jakarta.ws.rs jakarta.ws.rs-api - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb.demo demo-schema diff --git a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/CodeFirstEndpoint.java b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/CodeFirstEndpoint.java index 781eed61c81..7a01fcbddff 100644 --- a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/CodeFirstEndpoint.java +++ b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/CodeFirstEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.localRegistryServer; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/SelfServiceInvoker.java b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/SelfServiceInvoker.java index 0790cfeec7c..d68a0725aeb 100644 --- a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/SelfServiceInvoker.java +++ b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/SelfServiceInvoker.java @@ -34,10 +34,14 @@ interface IServerEndpoint { public CountDownLatch latch = new CountDownLatch(1); - public String result = ""; + private String result = ""; public void onAfterRegistry(BootEvent event) { result = endpoint.getName("hello"); latch.countDown(); } + + public String getResult() { + return result; + } } diff --git a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerApplication.java b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerApplication.java index 525e5624479..3c8cf2d25dd 100644 --- a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerApplication.java +++ b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerApplication.java @@ -34,7 +34,7 @@ public static void main(final String[] args) throws Exception { SelfServiceInvoker invoker = BeanUtils.getBean("SelfServiceInvoker"); invoker.latch.await(10, TimeUnit.SECONDS); - TestMgr.check(invoker.result, "hello"); + TestMgr.check(invoker.getResult(), "hello"); TestMgr.summary(); if (!TestMgr.errors().isEmpty()) { diff --git a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerEndpoint.java b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerEndpoint.java index 41a9cd532ff..be39f3a7989 100644 --- a/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerEndpoint.java +++ b/demo/demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/localRegistryServer/ServerEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.localRegistryServer; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-local-registry/pom.xml b/demo/demo-local-registry/pom.xml index 9b9a2f8b91c..a017b7239e9 100644 --- a/demo/demo-local-registry/pom.xml +++ b/demo/demo-local-registry/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-local-registry Java Chassis::Demo::Local Registry @@ -36,6 +36,32 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core org.apache.servicecomb diff --git a/demo/demo-multi-registries/demo-multi-registries-client/pom.xml b/demo/demo-multi-registries/demo-multi-registries-client/pom.xml index 7deefc679b1..eb2fc62b3e5 100644 --- a/demo/demo-multi-registries/demo-multi-registries-client/pom.xml +++ b/demo/demo-multi-registries/demo-multi-registries-client/pom.xml @@ -25,17 +25,13 @@ org.apache.servicecomb.demo demo-multi-registries - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.demo.registry.Application - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb.demo demo-schema diff --git a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/ServiceCenterEndpoint.java b/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/ServiceCenterEndpoint.java index ceba6f4309c..491732f92bc 100644 --- a/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/ServiceCenterEndpoint.java +++ b/demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/ServiceCenterEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.registry; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.springframework.web.bind.annotation.GetMapping; diff --git a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml index 94ad9b9c6ad..64fd9de9f70 100644 --- a/demo/demo-multi-registries/demo-multi-registries-server/pom.xml +++ b/demo/demo-multi-registries/demo-multi-registries-server/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-multi-registries - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -36,10 +36,6 @@ jakarta.ws.rs jakarta.ws.rs-api - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb.demo demo-schema diff --git a/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java b/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java index b15bb7c0df9..28ceec52b20 100644 --- a/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java +++ b/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java @@ -34,10 +34,14 @@ interface IServerEndpoint { public CountDownLatch latch = new CountDownLatch(1); - public String result = ""; + private String result = ""; public void onAfterRegistry(BootEvent event) { result = endpoint.getName("hello"); latch.countDown(); } + + public String getResult() { + return result; + } } diff --git a/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java b/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java index 7d533030131..c355b546e0d 100644 --- a/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java +++ b/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java @@ -34,7 +34,7 @@ public static void main(final String[] args) throws Exception { SelfServiceInvoker invoker = BeanUtils.getBean("SelfServiceInvoker"); invoker.latch.await(10, TimeUnit.SECONDS); - TestMgr.check(invoker.result, "hello"); + TestMgr.check(invoker.getResult(), "hello"); TestMgr.summary(); if (!TestMgr.errors().isEmpty()) { diff --git a/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java b/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java index 595997f99e1..03ed503e630 100644 --- a/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java +++ b/demo/demo-multi-registries/demo-multi-registries-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.registry; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-multi-registries/pom.xml b/demo/demo-multi-registries/pom.xml index 523edcb90c8..2bf4dcf836f 100644 --- a/demo/demo-multi-registries/pom.xml +++ b/demo/demo-multi-registries/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-multi-registries Java Chassis::Demo::Multi Registry @@ -36,6 +36,32 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core org.apache.servicecomb diff --git a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml index c7541c4b7fb..9ce4e1b81d6 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml +++ b/demo/demo-multi-service-center/demo-multi-service-center-client/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-multi-service-center - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -33,10 +33,6 @@ - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb service-center-client diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml index 04a387f3047..5106e5bb8a9 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverA/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-multi-service-center - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -36,10 +36,6 @@ jakarta.ws.rs jakarta.ws.rs-api - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb.demo demo-schema diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverA/src/main/java/org/apache/servicecomb/demo/multiServiceCenter/ServerEndpoint.java b/demo/demo-multi-service-center/demo-multi-service-center-serverA/src/main/java/org/apache/servicecomb/demo/multiServiceCenter/ServerEndpoint.java index 2e6efa642b5..d789dab7cb4 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverA/src/main/java/org/apache/servicecomb/demo/multiServiceCenter/ServerEndpoint.java +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverA/src/main/java/org/apache/servicecomb/demo/multiServiceCenter/ServerEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.multiServiceCenter; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml b/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml index 9a6cc07faff..9971d03cc8f 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-multi-service-center - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -36,10 +36,6 @@ jakarta.ws.rs jakarta.ws.rs-api - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb.demo demo-schema diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ConfigurationEndpoint.java b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ConfigurationEndpoint.java index 89dfebfaf3a..d4d9e9a4df4 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ConfigurationEndpoint.java +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ConfigurationEndpoint.java @@ -19,7 +19,7 @@ import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.slf4j.Logger; @@ -31,8 +31,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; -import com.netflix.config.DynamicPropertyFactory; - @RestSchema(schemaId = "ConfigurationEndpoint") @RequestMapping(path = "/register/url/config", produces = MediaType.APPLICATION_JSON) public class ConfigurationEndpoint { @@ -72,7 +70,7 @@ public String getValue(@RequestParam(name = "key") String key, @RequestParam(nam if (type == 1) { return environment.getProperty(key); } else if (type == 2) { - return DynamicPropertyFactory.getInstance().getStringProperty(key, null).get(); + return environment.getProperty(key); } else { switch (key) { case "demo.multi.service.center.serverB.key1": diff --git a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ServerEndpoint.java b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ServerEndpoint.java index af822e86853..3822ffd5fbb 100644 --- a/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ServerEndpoint.java +++ b/demo/demo-multi-service-center/demo-multi-service-center-serverB/src/main/java/org/apache/servicecomb/demo/multiServiceCenterServerB/ServerEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.multiServiceCenterServerB; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-multi-service-center/pom.xml b/demo/demo-multi-service-center/pom.xml index 4b3158bef43..cbbd640a12f 100644 --- a/demo/demo-multi-service-center/pom.xml +++ b/demo/demo-multi-service-center/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-multi-service-center Java Chassis::Demo::Multi Service Centers @@ -37,6 +37,32 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core org.apache.servicecomb diff --git a/demo/demo-multiple/a-client/pom.xml b/demo/demo-multiple/a-client/pom.xml index dfa776736df..573876c11d4 100644 --- a/demo/demo-multiple/a-client/pom.xml +++ b/demo/demo-multiple/a-client/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-multiple - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT a-client Java Chassis::Demo::Multiple::A client diff --git a/demo/demo-multiple/a-server/pom.xml b/demo/demo-multiple/a-server/pom.xml index f5ae1faaac3..06c092dad18 100644 --- a/demo/demo-multiple/a-server/pom.xml +++ b/demo/demo-multiple/a-server/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-multiple - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT a-server Java Chassis::Demo::Multiple::A server diff --git a/demo/demo-multiple/b-client/pom.xml b/demo/demo-multiple/b-client/pom.xml index a25e42eb040..92bf2f0872b 100644 --- a/demo/demo-multiple/b-client/pom.xml +++ b/demo/demo-multiple/b-client/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-multiple - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT b-client Java Chassis::Demo::Multiple::B client diff --git a/demo/demo-multiple/b-server/pom.xml b/demo/demo-multiple/b-server/pom.xml index 3ba859c7cb6..3ea3e85be08 100644 --- a/demo/demo-multiple/b-server/pom.xml +++ b/demo/demo-multiple/b-server/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-multiple - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT b-server diff --git a/demo/demo-multiple/multiple-client/pom.xml b/demo/demo-multiple/multiple-client/pom.xml index f0f482698fd..dc7b80ef4c1 100644 --- a/demo/demo-multiple/multiple-client/pom.xml +++ b/demo/demo-multiple/multiple-client/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-multiple - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT multiple-client Java Chassis::Demo::Multiple::Client diff --git a/demo/demo-multiple/multiple-server/pom.xml b/demo/demo-multiple/multiple-server/pom.xml index 745205cd92e..9509c00f66f 100644 --- a/demo/demo-multiple/multiple-server/pom.xml +++ b/demo/demo-multiple/multiple-server/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-multiple - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT multiple-server Java Chassis::Demo::Multiple::Server diff --git a/demo/demo-multiple/pom.xml b/demo/demo-multiple/pom.xml index 3ca135adc04..ce6f65eb538 100644 --- a/demo/demo-multiple/pom.xml +++ b/demo/demo-multiple/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-multiple Java Chassis::Demo::Multiple diff --git a/demo/demo-pojo/pojo-client/pom.xml b/demo/demo-pojo/pojo-client/pom.xml index fdbc6ff6374..732b18891ae 100644 --- a/demo/demo-pojo/pojo-client/pom.xml +++ b/demo/demo-pojo/pojo-client/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-pojo - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT pojo-client Java Chassis::Demo::POJO::Client diff --git a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java index ec94a0f6f03..975ea1b4612 100644 --- a/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java +++ b/demo/demo-pojo/pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClient.java @@ -63,7 +63,7 @@ public class PojoClient { @RpcReference(microserviceName = "pojo") public static Test test; - public static Test testFromXml; + private static Test testFromXml; private static SmartCare smartcare; diff --git a/demo/demo-pojo/pojo-server/pom.xml b/demo/demo-pojo/pojo-server/pom.xml index 12a6a142b1a..4232164cc5c 100644 --- a/demo/demo-pojo/pojo-server/pom.xml +++ b/demo/demo-pojo/pojo-server/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-pojo - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT pojo-server Java Chassis::Demo::POJO::Server diff --git a/demo/demo-pojo/pom.xml b/demo/demo-pojo/pom.xml index 3c147ad6409..e020309a91f 100644 --- a/demo/demo-pojo/pom.xml +++ b/demo/demo-pojo/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-pojo Java Chassis::Demo::POJO diff --git a/demo/demo-register-url-prefix/demo-register-url-prefix-client/pom.xml b/demo/demo-register-url-prefix/demo-register-url-prefix-client/pom.xml index 9590cbe1829..31ff5dd8c67 100644 --- a/demo/demo-register-url-prefix/demo-register-url-prefix-client/pom.xml +++ b/demo/demo-register-url-prefix/demo-register-url-prefix-client/pom.xml @@ -25,17 +25,13 @@ org.apache.servicecomb.demo demo-register-url-prefix - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.demo.prefix.Application - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb.demo demo-schema diff --git a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml index 80922523e52..321453ef945 100644 --- a/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml +++ b/demo/demo-register-url-prefix/demo-register-url-prefix-server/pom.xml @@ -25,30 +25,21 @@ org.apache.servicecomb.demo demo-register-url-prefix - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.demo.prefix.PrefixApplication - - org.apache.servicecomb - registry-service-center - jakarta.ws.rs jakarta.ws.rs-api - - org.apache.servicecomb - java-chassis-spring-boot-starter-servlet - org.apache.servicecomb inspector - diff --git a/demo/demo-register-url-prefix/demo-register-url-prefix-server/src/main/java/org/apache/servicecomb/demo/prefix/RegisterUrlPrefixEndpoint.java b/demo/demo-register-url-prefix/demo-register-url-prefix-server/src/main/java/org/apache/servicecomb/demo/prefix/RegisterUrlPrefixEndpoint.java index e383b0b8620..86b1d40026b 100644 --- a/demo/demo-register-url-prefix/demo-register-url-prefix-server/src/main/java/org/apache/servicecomb/demo/prefix/RegisterUrlPrefixEndpoint.java +++ b/demo/demo-register-url-prefix/demo-register-url-prefix-server/src/main/java/org/apache/servicecomb/demo/prefix/RegisterUrlPrefixEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.prefix; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-register-url-prefix/pom.xml b/demo/demo-register-url-prefix/pom.xml index 4468a012610..11367e3d66d 100644 --- a/demo/demo-register-url-prefix/pom.xml +++ b/demo/demo-register-url-prefix/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-register-url-prefix Java Chassis::Demo::Spring Boot::Register URL Prefix @@ -40,6 +40,32 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core org.apache.servicecomb diff --git a/demo/demo-schema/pom.xml b/demo/demo-schema/pom.xml index dbd4315d482..73e78529a99 100644 --- a/demo/demo-schema/pom.xml +++ b/demo/demo-schema/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-schema Java Chassis::Demo::Schema @@ -70,9 +70,11 @@ org.apache.servicecomb inspector + - javax.xml.bind - jaxb-api + org.glassfish.jaxb + jaxb-runtime + 2.3.2 diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java index c40c4da933d..1f97bae664a 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/CodeFirstRestTemplate.java @@ -36,7 +36,7 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.web.client.RestTemplate; @@ -147,7 +147,6 @@ private void testCodeFirstAppXml(RestTemplate template, String cseUrlPrefix) { requestEntity, JAXBPerson.class); TestMgr.check(-1, ProduceProcessorManager.INSTANCE.findProcessor(MediaType.APPLICATION_XML_VALUE, null).getOrder()); - // test case maybe fail in JDK 11 TestMgr.check(person, resEntity.getBody()); } @@ -162,7 +161,7 @@ private void testCodeFirstBytes(RestTemplate template, String cseUrlPrefix) { TestMgr.check(2, result[2]); } - protected void checkStatusCode(String microserviceName, int expectStatusCode, HttpStatus httpStatus) { + protected void checkStatusCode(String microserviceName, int expectStatusCode, HttpStatusCode httpStatus) { TestMgr.check(expectStatusCode, httpStatus.value()); } diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchema.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchema.java index 0f0b5b5a967..35c05ce49b3 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchema.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/api/IHeaderParamWithListSchema.java @@ -19,9 +19,9 @@ import java.util.List; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; import io.swagger.annotations.ApiParam; diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBJob.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBJob.java index 620879803ab..a188584a28d 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBJob.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBJob.java @@ -16,11 +16,11 @@ */ package org.apache.servicecomb.demo.jaxbbean; -import javax.xml.bind.annotation.XmlAccessOrder; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorOrder; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlAccessOrder; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorOrder; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "job") @XmlAccessorType(XmlAccessType.FIELD) diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBPerson.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBPerson.java index bd66e9dbd9f..450ebacabe8 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBPerson.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxbbean/JAXBPerson.java @@ -18,13 +18,13 @@ import java.io.Serializable; -import javax.xml.bind.annotation.XmlAccessOrder; -import javax.xml.bind.annotation.XmlAccessorOrder; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlTransient; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlAccessOrder; +import jakarta.xml.bind.annotation.XmlAccessorOrder; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlTransient; +import jakarta.xml.bind.annotation.XmlType; @XmlType(propOrder = {"name", "role", "job"}) @XmlRootElement(name = "person") diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationModel.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationModel.java index 09e26129b7e..7a99260c393 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationModel.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/jaxrs/server/validation/ValidationModel.java @@ -19,7 +19,7 @@ import java.util.List; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; public class ValidationModel { @NotNull diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseRequest.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseRequest.java index 1544e99b81d..75aa88c7c7d 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseRequest.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseRequest.java @@ -21,13 +21,13 @@ import java.util.Map; public class ParseRequest { - public String msgType = ""; + private String msgType = ""; - public String strMsg; + private String strMsg; - public String strID = ""; + private String strID = ""; - public Map flags = new HashMap<>(); + private Map flags = new HashMap<>(); public String getMsgType() { return msgType; diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseResponse.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseResponse.java index 8330fe8c9cc..489a2e137ed 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseResponse.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/mapnull/ParseResponse.java @@ -20,15 +20,15 @@ import java.util.Map; public class ParseResponse { - public String resultCode = "99999999"; + private String resultCode = "99999999"; - public String resultInfo = "unknown result"; + private String resultInfo = "unknown result"; - public String msgType = ""; + private String msgType = ""; - public Map msgHeader; + private Map msgHeader; - public Map msgBody; + private Map msgBody; public String getResultCode() { return resultCode; diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/ProduceAppXmlProcessor.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/ProduceAppXmlProcessor.java index 2303e5d7bdb..17659cfed21 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/ProduceAppXmlProcessor.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/ProduceAppXmlProcessor.java @@ -20,7 +20,7 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; import org.apache.servicecomb.demo.utils.JAXBUtils; diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/override/ProduceAppXmlProcessor.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/override/ProduceAppXmlProcessor.java index 116b15fa65c..aebe13eb116 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/override/ProduceAppXmlProcessor.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/produceprocessor/override/ProduceAppXmlProcessor.java @@ -20,7 +20,7 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; import org.apache.servicecomb.demo.utils.JAXBUtils; diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/utils/JAXBUtils.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/utils/JAXBUtils.java index 671260f049f..fcfccda4b08 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/utils/JAXBUtils.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/utils/JAXBUtils.java @@ -20,9 +20,6 @@ import java.io.StringWriter; import java.nio.charset.StandardCharsets; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Source; import javax.xml.transform.sax.SAXSource; @@ -33,6 +30,10 @@ import com.fasterxml.jackson.databind.JavaType; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.Marshaller; +import jakarta.xml.bind.Unmarshaller; + public class JAXBUtils { private static final Logger LOGGER = LoggerFactory.getLogger(JAXBUtils.class); diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Student.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Student.java index 65feea2ec7f..3117c5e1f82 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Student.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Student.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.demo.validator; -import javax.validation.constraints.Max; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.NotNull; public class Student { @NotNull diff --git a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Teacher.java b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Teacher.java index 009a25030b4..b7015e2920e 100644 --- a/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Teacher.java +++ b/demo/demo-schema/src/main/java/org/apache/servicecomb/demo/validator/Teacher.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.validator; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; public class Teacher { diff --git a/demo/demo-signature/pom.xml b/demo/demo-signature/pom.xml index 89bbb424d37..f757577f0c4 100644 --- a/demo/demo-signature/pom.xml +++ b/demo/demo-signature/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-signature Java Chassis::Demo::Signature diff --git a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ClientSignature.java b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ClientSignature.java index 84bbe671340..833948f7611 100644 --- a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ClientSignature.java +++ b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/ClientSignature.java @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.filter.HttpClientFilter; import org.apache.servicecomb.core.Invocation; diff --git a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java index 33e485b1f8d..41c334c85c6 100644 --- a/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java +++ b/demo/demo-signature/src/main/java/org/apache/servicecomb/demo/signature/SignatureUtils.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.List; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.lang.StringUtils; import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx; diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/pom.xml b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/pom.xml index f1fa09d3223..fc6c0ea2c20 100644 --- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/pom.xml +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-client/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-spring-boot - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT diff --git a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml index 7cedad3ecf9..5211e416980 100644 --- a/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml +++ b/demo/demo-spring-boot-provider/demo-spring-boot-jaxrs-server/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-spring-boot - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT org.apache.servicecomb.springboot.jaxrs.server.JaxrsServer diff --git a/demo/demo-spring-boot-provider/pom.xml b/demo/demo-spring-boot-provider/pom.xml index 3b257ca031d..04c0e7bf88f 100644 --- a/demo/demo-spring-boot-provider/pom.xml +++ b/demo/demo-spring-boot-provider/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-spring-boot Java Chassis::Demo::Spring Boot @@ -40,6 +40,32 @@ org.apache.servicecomb java-chassis-spring-boot-starter-standalone + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml index 24e3c433643..5d71f8766a5 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-spring-boot-transport - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java index b0abd546abe..73b99f472ce 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/pojo/client/PojoClientTest.java @@ -40,11 +40,11 @@ public class PojoClientTest { @RpcReference(microserviceName = "pojo") public static Test test; - public static Test testFromXml; + private static Test testFromXml; - public static final byte[] buffer = new byte[1024]; + private static final byte[] buffer = new byte[1024]; - public static final String SPLITPARAM_RESPONSE_USER_SUFFIX = "(modified by MyHandler)"; + private static final String SPLITPARAM_RESPONSE_USER_SUFFIX = "(modified by MyHandler)"; static { Arrays.fill(buffer, (byte) 1); diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml index 41275da5c21..85dd47107bd 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-spring-boot-transport - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml index 59abc304e00..90445663767 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-client/pom.xml @@ -26,7 +26,7 @@ org.apache.servicecomb.demo demo-spring-boot-transport - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml index ef353e7c8e3..6872fb008de 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml +++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/pom.xml @@ -26,7 +26,7 @@ org.apache.servicecomb.demo demo-spring-boot-transport - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT diff --git a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/src/main/java/org/apache/servicecomb/springboot/springmvc/server/UploadDownloadSchema.java b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/src/main/java/org/apache/servicecomb/springboot/springmvc/server/UploadDownloadSchema.java index 4c4cd0df5e9..a20dcec0fd7 100644 --- a/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/src/main/java/org/apache/servicecomb/springboot/springmvc/server/UploadDownloadSchema.java +++ b/demo/demo-spring-boot-transport/demo-spring-boot-springmvc-server/src/main/java/org/apache/servicecomb/springboot/springmvc/server/UploadDownloadSchema.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-spring-boot-transport/pom.xml b/demo/demo-spring-boot-transport/pom.xml index 760c49efc1c..f2b82bd8d1a 100644 --- a/demo/demo-spring-boot-transport/pom.xml +++ b/demo/demo-spring-boot-transport/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-spring-boot-transport Java Chassis::Demo::Spring Boot::Transport @@ -38,6 +38,32 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + + + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core org.apache.servicecomb diff --git a/demo/demo-springmvc/pom.xml b/demo/demo-springmvc/pom.xml index 69aec35819b..e66b4be01b3 100644 --- a/demo/demo-springmvc/pom.xml +++ b/demo/demo-springmvc/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-springmvc Java Chassis::Demo::Spring MVC diff --git a/demo/demo-springmvc/springmvc-client/pom.xml b/demo/demo-springmvc/springmvc-client/pom.xml index c76fe03f885..bae31190a08 100644 --- a/demo/demo-springmvc/springmvc-client/pom.xml +++ b/demo/demo-springmvc/springmvc-client/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-springmvc - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT springmvc-client Java Chassis::Demo::Spring MVC::Client diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java index f22675f8a9d..429053cc609 100644 --- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java +++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/CodeFirstRestTemplateSpringmvc.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.commons.io.FileUtils; import org.apache.servicecomb.bizkeeper.BizkeeperExceptionUtils; diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringMVCSchema.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringMVCSchema.java index 6368c572725..6c790d9dc98 100644 --- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringMVCSchema.java +++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/SpringMVCSchema.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.springmvc.client; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.springframework.web.bind.annotation.RequestBody; diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestContentType.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestContentType.java index 65fc1461dd7..8f16f822973 100644 --- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestContentType.java +++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestContentType.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.springmvc.client; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.demo.TestMgr; import org.apache.servicecomb.provider.springmvc.reference.CseHttpEntity; diff --git a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestMaxHttpUrlLength.java b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestMaxHttpUrlLength.java index 2cbc09a7d23..9f297dd180e 100644 --- a/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestMaxHttpUrlLength.java +++ b/demo/demo-springmvc/springmvc-client/src/main/java/org/apache/servicecomb/demo/springmvc/client/TestMaxHttpUrlLength.java @@ -15,7 +15,7 @@ */ package org.apache.servicecomb.demo.springmvc.client; -import static javax.ws.rs.core.Response.Status.REQUEST_URI_TOO_LONG; +import static jakarta.ws.rs.core.Response.Status.REQUEST_URI_TOO_LONG; import org.apache.servicecomb.demo.CategorizedTestCase; import org.apache.servicecomb.demo.TestMgr; diff --git a/demo/demo-springmvc/springmvc-server/pom.xml b/demo/demo-springmvc/springmvc-server/pom.xml index 429bd30346e..31720ed359c 100644 --- a/demo/demo-springmvc/springmvc-server/pom.xml +++ b/demo/demo-springmvc/springmvc-server/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb.demo demo-springmvc - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT springmvc-server Java Chassis::Demo::Spring MVC::Server diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/AnnotationsTest.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/AnnotationsTest.java index b189ee8947c..671614b20a5 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/AnnotationsTest.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/AnnotationsTest.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.springmvc.server; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.demo.controller.Person; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ApiImplicitParamsSchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ApiImplicitParamsSchema.java index 82aef935848..673b42c6291 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ApiImplicitParamsSchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ApiImplicitParamsSchema.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.demo.springmvc.server; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.springframework.http.MediaType; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java index 27b8091879a..ee12a9bddc1 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/CodeFirstSpringmvc.java @@ -25,10 +25,10 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/Compatible1xTestSchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/Compatible1xTestSchema.java index 79d6f6b5dee..913a2e35d0a 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/Compatible1xTestSchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/Compatible1xTestSchema.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.demo.springmvc.server; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Const; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvc.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvc.java index 94281caeae0..fcfbc6aeae7 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvc.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvc.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.demo.springmvc.server; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.springframework.web.bind.annotation.RequestBody; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvcOverwrite.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvcOverwrite.java index 962fb23fe09..0dd484a1ddb 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvcOverwrite.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ContentTypeSpringmvcOverwrite.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.springmvc.server; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java index ff1c6514e39..96184c355db 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ControllerImpl.java @@ -19,10 +19,10 @@ import java.util.Arrays; -import javax.servlet.http.HttpServletRequest; -import javax.validation.constraints.Min; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.demo.controller.Person; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DateTimeSchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DateTimeSchema.java index ab9f8edd431..4dfdba44ba0 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DateTimeSchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DateTimeSchema.java @@ -21,8 +21,8 @@ import java.time.LocalDateTime; import java.util.Date; -import javax.ws.rs.PathParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.springframework.web.bind.annotation.GetMapping; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java index bcabd9ec419..6aa3c905960 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/DownloadSchema.java @@ -22,7 +22,7 @@ import java.nio.charset.StandardCharsets; import java.util.UUID; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ResponseOKExceptionConverter.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ResponseOKExceptionConverter.java index da363efe616..0d93b388f4d 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ResponseOKExceptionConverter.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/ResponseOKExceptionConverter.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.demo.springmvc.server; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/RetrySchema.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/RetrySchema.java index 110176002f4..b3a32b34020 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/RetrySchema.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/RetrySchema.java @@ -19,7 +19,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicLong; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvc.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvc.java index 15e28fb32b2..0ccca731612 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvc.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvc.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.demo.springmvc.server; -import javax.validation.constraints.Min; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.core.MediaType; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvcImpl.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvcImpl.java index 548e59197c1..5fd96e7255d 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvcImpl.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SchemeInterfaceSpringmvcImpl.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.springmvc.server; -import javax.validation.constraints.Min; +import jakarta.validation.constraints.Min; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMVCCommonSchemaInterface.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMVCCommonSchemaInterface.java index edd200bd9ce..1bd1abba2e3 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMVCCommonSchemaInterface.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMVCCommonSchemaInterface.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.springmvc.server; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.demo.CommonSchemaInterface; diff --git a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java index 3e915096205..a30b9ad84d3 100644 --- a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java +++ b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/server/SpringMvcDefaultValues.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.demo.springmvc.server; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.springframework.web.bind.annotation.GetMapping; diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/pom.xml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/pom.xml index e74e360c196..77e88a6c418 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/pom.xml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-zeroconfig-schemadiscovery-registry - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -39,6 +39,20 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.servicecomb diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java index 9355b3b961d..769f739cfc2 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/ClientServerEndpoint.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.pojo.RpcReference; import org.apache.servicecomb.provider.rest.common.RestSchema; diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/GovernanceEndpoint.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/GovernanceEndpoint.java index 9bb256d251a..f6f495141e3 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/GovernanceEndpoint.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-client/src/main/java/org/apache/servicecomb/demo/zeroconfig/client/GovernanceEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.zeroconfig.client; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.provider.springmvc.reference.RestTemplateBuilder; diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/pom.xml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/pom.xml index af6841b7235..012f4471b1b 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/pom.xml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-zeroconfig-schemadiscovery-registry - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -43,6 +43,20 @@ org.apache.servicecomb java-chassis-spring-boot-starter-standalone + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.servicecomb diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/EdgeApplication.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/EdgeApplication.java index 91685d0cddf..ba3e73f26d1 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/EdgeApplication.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/EdgeApplication.java @@ -34,7 +34,7 @@ public static void main(final String[] args) throws Exception { SelfServiceInvoker invoker = BeanUtils.getBean("SelfServiceInvoker"); invoker.latch.await(10, TimeUnit.SECONDS); - TestMgr.check(invoker.result, "hello"); + TestMgr.check(invoker.getResult(), "hello"); TestMgr.summary(); if (!TestMgr.errors().isEmpty()) { diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/SelfServiceInvoker.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/SelfServiceInvoker.java index e6535240ac3..3ce0cbf9144 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/SelfServiceInvoker.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/SelfServiceInvoker.java @@ -33,10 +33,14 @@ interface IServerEndpoint { public CountDownLatch latch = new CountDownLatch(1); - public String result = ""; + private String result = ""; public void onAfterRegistry(BootEvent event) { result = endpoint.getName("hello"); latch.countDown(); } + + public String getResult() { + return result; + } } diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/ServerEndpoint.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/ServerEndpoint.java index 24e25ed3ae3..8b57fc65272 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/ServerEndpoint.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-edge/src/main/java/org/apache/servicecomb/demo/zeroconfig/edge/ServerEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.zeroconfig.edge; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.swagger.invocation.context.ContextUtils; diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/pom.xml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/pom.xml index 7c368d7b641..5b794fb57ce 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/pom.xml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-zeroconfig-schemadiscovery-registry - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -39,6 +39,20 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.servicecomb diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/GovernanceEndpoint.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/GovernanceEndpoint.java index 2ae69df0dd8..0baada1ff47 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/GovernanceEndpoint.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/GovernanceEndpoint.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/SelfServiceInvoker.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/SelfServiceInvoker.java index 0a52776fc8e..c5378b27cf9 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/SelfServiceInvoker.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/SelfServiceInvoker.java @@ -33,10 +33,14 @@ interface IServerEndpoint { public CountDownLatch latch = new CountDownLatch(1); - public String result = ""; + private String result = ""; public void onAfterRegistry(BootEvent event) { result = endpoint.getName("hello"); latch.countDown(); } + + public String getResult() { + return result; + } } diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerApplication.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerApplication.java index 27e708b63e5..ea1e7b37d15 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerApplication.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerApplication.java @@ -33,7 +33,7 @@ public static void main(final String[] args) throws Exception { SelfServiceInvoker invoker = BeanUtils.getBean("SelfServiceInvoker"); invoker.latch.await(10, TimeUnit.SECONDS); - TestMgr.check(invoker.result, "hello"); + TestMgr.check(invoker.getResult(), "hello"); TestMgr.summary(); if (!TestMgr.errors().isEmpty()) { diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerEndpoint.java b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerEndpoint.java index d010caa1e28..f13ef264583 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerEndpoint.java +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-server/src/main/java/org/apache/servicecomb/demo/zeroconfig/server/ServerEndpoint.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.demo.zeroconfig.server; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.swagger.invocation.context.ContextUtils; diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml index 714776b33d3..00ebb19ec89 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/demo-zeroconfig-schemadiscovery-registry-tests/pom.xml @@ -25,7 +25,7 @@ org.apache.servicecomb.demo demo-zeroconfig-schemadiscovery-registry - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT @@ -35,6 +35,20 @@ org.apache.servicecomb java-chassis-spring-boot-starter-servlet + + + ch.qos.logback + logback-core + + + ch.qos.logback + logback-classic + + + org.apache.logging.log4j + log4j-to-slf4j + + org.apache.servicecomb diff --git a/demo/demo-zeroconfig-schemadiscovery-registry/pom.xml b/demo/demo-zeroconfig-schemadiscovery-registry/pom.xml index 7d26b804575..61b21e25a93 100644 --- a/demo/demo-zeroconfig-schemadiscovery-registry/pom.xml +++ b/demo/demo-zeroconfig-schemadiscovery-registry/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb.demo demo-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT demo-zeroconfig-schemadiscovery-registry Java Chassis::Demo::ZeroConfig-SchemaDiscovery Registry @@ -40,5 +40,17 @@ foundation-test-scaffolding compile + + org.apache.logging.log4j + log4j-slf4j-impl + + + org.apache.logging.log4j + log4j-api + + + org.apache.logging.log4j + log4j-core + \ No newline at end of file diff --git a/demo/docker-build-config/pom.xml b/demo/docker-build-config/pom.xml index 4faa3efdd33..919a661f898 100644 --- a/demo/docker-build-config/pom.xml +++ b/demo/docker-build-config/pom.xml @@ -22,7 +22,7 @@ demo-parent org.apache.servicecomb.demo - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 @@ -42,7 +42,7 @@ ${project.artifactId}:${project.version} ${project.artifactId} - openjdk:8-jre-alpine + openjdk:21 7070 8080 diff --git a/demo/docker-run-config-edge/pom.xml b/demo/docker-run-config-edge/pom.xml index 83839c38e9d..a731cd06120 100644 --- a/demo/docker-run-config-edge/pom.xml +++ b/demo/docker-run-config-edge/pom.xml @@ -21,7 +21,7 @@ demo-parent org.apache.servicecomb.demo - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/demo/docker-run-config-local/pom.xml b/demo/docker-run-config-local/pom.xml index 3fd8c06afe3..1cfae3af3b3 100644 --- a/demo/docker-run-config-local/pom.xml +++ b/demo/docker-run-config-local/pom.xml @@ -21,7 +21,7 @@ demo-parent org.apache.servicecomb.demo - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/demo/docker-run-config/pom.xml b/demo/docker-run-config/pom.xml index 8ff404dd578..34b6a58f8a0 100644 --- a/demo/docker-run-config/pom.xml +++ b/demo/docker-run-config/pom.xml @@ -21,7 +21,7 @@ demo-parent org.apache.servicecomb.demo - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 @@ -62,7 +62,7 @@ - -Dservicecomb.service.registry.address=http://sc.servicecomb.io:30100 -Dservicecomb.service.publishAddress=${docker.hostname} + -Dservicecomb.service.registry.address=http://sc.servicecomb.io:30100 /maven/maven/${demo.service.name}-${project.version}.jar @@ -121,34 +121,10 @@ docker - - org.codehaus.gmavenplus - gmavenplus-plugin - - - add-default-properties - initialize - - execute - - - - - - - - - org.apache.maven.plugins maven-failsafe-plugin - - http://${docker.hostname}:30100 - ${jacoco.failsafe.argLine} @@ -167,30 +143,6 @@ docker-machine - - org.codehaus.gmavenplus - gmavenplus-plugin - - - add-dynamic-properties - prepare-package - - execute - - - - - - - - - diff --git a/demo/pom.xml b/demo/pom.xml index fb6c12c2e47..5afc9ed152e 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default org.apache.servicecomb.demo diff --git a/dependencies/bom/pom.xml b/dependencies/bom/pom.xml index 3c39c995d50..6696aa0becf 100644 --- a/dependencies/bom/pom.xml +++ b/dependencies/bom/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb java-chassis-dependencies-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT java-chassis-bom diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml index ca190edd7bc..3132ff8ac66 100644 --- a/dependencies/default/pom.xml +++ b/dependencies/default/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-dependencies-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT java-chassis-dependencies @@ -37,8 +37,8 @@ 1.9.19 3.23.1 4.2.0 - 5.14.1 - 1.12.20 + 6.0.3 + 1.15.11 1.9.4 1.10 2.11.0 @@ -56,25 +56,25 @@ 5.1.0 1.3 2.1.12 - 6.2.5.Final + 8.0.1.Final 4.5.14 1.5.18 - 2.15.0 + 2.18.2 1.5.3 1.3.2 1 1.5 - 2.1.6 - 2.38 + 3.1.0 + 3.1.4 1.34 4.13.2 - 5.9.1 + 5.11.4 1.2.17 - 2.19.0 + 2.24.3 1.2.11 3.8.6 1.10.2 - 4.11.0 + 5.17.0 5.14.0 2.2.0 0.3.0 @@ -90,17 +90,23 @@ 0.4.20 1.0.0 0.13.2 - 4.0.4 + 6.0.0 1.7.36 2.2 1.4.2 - 5.3.36 - 2.7.18 + 6.2.5 + 3.4.4 1.6.9 1.3.3 4.5.13 - 2.24.0 - 2.16.3 + 3.4.3 + 3.4.0 + 3.0.2 + 2.1.3 + 2.1.1 + 4.0.2 + 2.3.1 + 3.0.9 ${basedir}/../.. @@ -520,27 +526,47 @@ zipkin ${zipkin.version} + - io.zipkin.zipkin2 - zipkin-junit - ${zipkin.version} + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.version} - jakarta.servlet jakarta.servlet-api ${servlet-api.version} - com.sun.activation - jakarta.activation - ${activation.version} + jakarta.validation + jakarta.validation-api + ${jakarta.validation.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation.version} javax.annotation javax.annotation-api ${javax-annotation.version} + + jakarta.annotation + jakarta.annotation-api + ${jakarta.annotation-api.version} + + + com.sun.activation + jakarta.activation + ${activation.version} + + + org.codehaus.groovy + groovy + ${groovy.version} + javax.inject @@ -707,12 +733,6 @@ ${bytebuddy.version} test - - org.mockito - mockito-inline - ${mockito.version} - test - org.mock-server @@ -774,6 +794,12 @@ ${java-websocket.version} + + javax.xml.bind + jaxb-api + ${jaxb-api.version} + + org.apache.servicecomb java-chassis-bom diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 793559f0174..e78b9240f62 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb java-chassis - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT java-chassis-dependencies-parent diff --git a/deployment/pom.xml b/deployment/pom.xml index dfccfecfa5e..9265864303e 100644 --- a/deployment/pom.xml +++ b/deployment/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index 8156a42477c..ff76b9a138e 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default apache-servicecomb-java-chassis-distribution diff --git a/dynamic-config/config-apollo/pom.xml b/dynamic-config/config-apollo/pom.xml index 4e6e2ca133f..68f140ef23f 100644 --- a/dynamic-config/config-apollo/pom.xml +++ b/dynamic-config/config-apollo/pom.xml @@ -22,7 +22,7 @@ dynamic-config org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 config-apollo diff --git a/dynamic-config/config-cc/pom.xml b/dynamic-config/config-cc/pom.xml index fdb51c91dde..e8edde7ffd4 100644 --- a/dynamic-config/config-cc/pom.xml +++ b/dynamic-config/config-cc/pom.xml @@ -21,7 +21,7 @@ dynamic-config org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/dynamic-config/config-kie/pom.xml b/dynamic-config/config-kie/pom.xml index 2a540b6c07a..b4db3e465f2 100644 --- a/dynamic-config/config-kie/pom.xml +++ b/dynamic-config/config-kie/pom.xml @@ -23,7 +23,7 @@ dynamic-config org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/dynamic-config/config-nacos/pom.xml b/dynamic-config/config-nacos/pom.xml index 010159bc8e9..2c056d0e6c1 100644 --- a/dynamic-config/config-nacos/pom.xml +++ b/dynamic-config/config-nacos/pom.xml @@ -22,7 +22,7 @@ dynamic-config org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 config-nacos diff --git a/dynamic-config/pom.xml b/dynamic-config/pom.xml index c6a74bff257..9114ba55e62 100644 --- a/dynamic-config/pom.xml +++ b/dynamic-config/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/edge/edge-core/pom.xml b/edge/edge-core/pom.xml index 541df465770..9f37175afda 100644 --- a/edge/edge-core/pom.xml +++ b/edge/edge-core/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb edge - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT edge-core Java Chassis::Edge::Core @@ -61,10 +61,5 @@ swagger-generator-jaxrs test - - org.mockito - mockito-inline - test - diff --git a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/AbstractEdgeDispatcher.java b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/AbstractEdgeDispatcher.java index 7cdc43ea038..3cf42485cf6 100644 --- a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/AbstractEdgeDispatcher.java +++ b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/AbstractEdgeDispatcher.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.edge.core; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; import org.apache.servicecomb.swagger.invocation.exception.InvocationException; diff --git a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeAddHeaderFilter.java b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeAddHeaderFilter.java index f6bb521402d..a6e85cb9ccd 100644 --- a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeAddHeaderFilter.java +++ b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeAddHeaderFilter.java @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.filter.ConsumerFilter; diff --git a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeServerCodecFilter.java b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeServerCodecFilter.java index 71968af9c36..dd8a1e760f7 100644 --- a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeServerCodecFilter.java +++ b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeServerCodecFilter.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.common.rest.filter.inner.RestServerCodecFilter; import org.apache.servicecomb.core.Invocation; diff --git a/edge/pom.xml b/edge/pom.xml index ed57116f11e..7c108d024f6 100644 --- a/edge/pom.xml +++ b/edge/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default edge diff --git a/foundations/foundation-common/pom.xml b/foundations/foundation-common/pom.xml index 9dd012c3ef3..ef20501c923 100644 --- a/foundations/foundation-common/pom.xml +++ b/foundations/foundation-common/pom.xml @@ -20,7 +20,7 @@ 4.0.0 org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT foundations foundation-common diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatus.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatus.java index 15489ba95a9..45806dcc53f 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatus.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatus.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.foundation.common.http; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.Status.Family; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.StatusType; public class HttpStatus implements StatusType { public static boolean isSuccess(int code) { diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusManager.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusManager.java index 44e91453818..332f3757524 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusManager.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusManager.java @@ -19,11 +19,11 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; - import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; + public class HttpStatusManager { private final Map statusMap = new ConcurrentHashMap<>(); diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusUtils.java index 4dac0e4259b..3c4693c9eab 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusUtils.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/http/HttpStatusUtils.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.foundation.common.http; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; public final class HttpStatusUtils { private static final HttpStatusManager MGR = new HttpStatusManager(); diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/AbstractPart.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/AbstractPart.java index b79699d4763..0c849a5d83a 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/AbstractPart.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/AbstractPart.java @@ -22,8 +22,9 @@ import java.util.Collection; import javax.activation.MimetypesFileTypeMap; -import javax.servlet.http.Part; -import javax.ws.rs.core.MediaType; + +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.MediaType; public class AbstractPart implements Part { private static final MimetypesFileTypeMap mimetypesFileTypeMap = new MimetypesFileTypeMap(); diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/FilePartForSend.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/FilePartForSend.java index f86e696a66e..b2252361997 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/FilePartForSend.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/part/FilePartForSend.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.foundation.common.part; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; public interface FilePartForSend extends Part { boolean isDeleteAfterFinished(); diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/PartUtils.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/PartUtils.java index cb9b23393be..55caa4b2ec7 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/PartUtils.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/PartUtils.java @@ -19,7 +19,7 @@ import java.io.File; import java.io.InputStream; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.FilePart; import org.apache.servicecomb.foundation.common.part.InputStreamPart; diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartDeserializer.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartDeserializer.java index 98b489f9c12..26abdbce29b 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartDeserializer.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartDeserializer.java @@ -19,7 +19,7 @@ import java.io.IOException; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.databind.DeserializationContext; diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartSerializer.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartSerializer.java index eca1db08a88..005250d0367 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartSerializer.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/JavaxServletPartSerializer.java @@ -19,7 +19,7 @@ import java.io.IOException; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.ObjectCodec; diff --git a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/PartModule.java b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/PartModule.java index 7749a9534d2..5c5402ad133 100644 --- a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/PartModule.java +++ b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/utils/json/PartModule.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.foundation.common.utils.json; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.utils.SPIOrder; diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatus.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatus.java index 6797c85acd2..b48ceeb4ee0 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatus.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatus.java @@ -20,8 +20,8 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status.Family; public class TestHttpStatus { @Test diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatusUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatusUtils.java index 43a59cf4892..87776b326ef 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatusUtils.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpStatusUtils.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.foundation.common.http; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpUtils.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpUtils.java index a4201429620..7bc32ad89ec 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpUtils.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/http/TestHttpUtils.java @@ -18,7 +18,7 @@ import java.net.URISyntaxException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/part/TestAbstractPart.java b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/part/TestAbstractPart.java index de00d29d340..ae84a460e98 100644 --- a/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/part/TestAbstractPart.java +++ b/foundations/foundation-common/src/test/java/org/apache/servicecomb/foundation/common/part/TestAbstractPart.java @@ -19,7 +19,7 @@ import java.io.IOException; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/foundations/foundation-config/pom.xml b/foundations/foundation-config/pom.xml index 144203de616..1af0aa6225f 100644 --- a/foundations/foundation-config/pom.xml +++ b/foundations/foundation-config/pom.xml @@ -21,7 +21,7 @@ foundations org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java index 10d9bc7b3ea..9a8ee467c92 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/ConfigUtil.java @@ -33,7 +33,7 @@ import java.util.concurrent.CopyOnWriteArraySet; import java.util.stream.Collectors; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.commons.configuration.AbstractConfiguration; import org.apache.commons.configuration.Configuration; diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectProperty.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectProperty.java index e81465b0f0e..3826b70460f 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectProperty.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/ConfigObjectProperty.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.config.priority; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.apache.servicecomb.foundation.common.utils.bean.Setter; diff --git a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/PriorityPropertyFactory.java b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/PriorityPropertyFactory.java index f3ec2a72e63..53fe32fa1e0 100644 --- a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/PriorityPropertyFactory.java +++ b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/priority/PriorityPropertyFactory.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.stream.Stream; -import javax.annotation.PreDestroy; +import jakarta.annotation.PreDestroy; import org.apache.commons.configuration.AbstractConfiguration; import org.apache.commons.configuration.event.ConfigurationEvent; diff --git a/foundations/foundation-metrics/pom.xml b/foundations/foundation-metrics/pom.xml index 4019d57ca54..da9a147a2f9 100644 --- a/foundations/foundation-metrics/pom.xml +++ b/foundations/foundation-metrics/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb foundations - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT foundation-metrics Java Chassis::Foundations::Metrics diff --git a/foundations/foundation-protobuf/pom.xml b/foundations/foundation-protobuf/pom.xml index 3af1a6391b6..076640252ac 100644 --- a/foundations/foundation-protobuf/pom.xml +++ b/foundations/foundation-protobuf/pom.xml @@ -21,7 +21,7 @@ foundations org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 @@ -46,8 +46,8 @@ protostuff-core - com.google.code.findbugs - jsr305 + jakarta.annotation + jakarta.annotation-api diff --git a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java index 632de7bc054..dabadc78e7d 100644 --- a/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java +++ b/foundations/foundation-protobuf/src/main/java/org/apache/servicecomb/foundation/protobuf/internal/parser/ContentFileReader.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.foundation.protobuf.internal.parser; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; import org.antlr.v4.runtime.CharStream; import org.antlr.v4.runtime.CharStreams; diff --git a/foundations/foundation-registry/pom.xml b/foundations/foundation-registry/pom.xml index 7373a825a93..9307ec3fa99 100644 --- a/foundations/foundation-registry/pom.xml +++ b/foundations/foundation-registry/pom.xml @@ -21,7 +21,7 @@ foundations org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 @@ -47,10 +47,5 @@ org.apache.servicecomb foundation-test-scaffolding - - org.mockito - mockito-inline - test - diff --git a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java index 4868654cae2..faaa9d638e3 100644 --- a/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java +++ b/foundations/foundation-registry/src/test/java/org/apache/servicecomb/registry/discovery/TestDiscoveryTree.java @@ -187,6 +187,7 @@ public void easyDiscovery() { result = discoveryTree.discovery(context, null, null, null); Assertions.assertEquals(parent.name(), result.name()); Assertions.assertEquals(parent.cacheVersion(), result.cacheVersion()); + DiscoveryManager.renewInstance(); } @Test @@ -212,6 +213,7 @@ public DiscoveryTreeNode discovery(DiscoveryContext context, DiscoveryTreeNode p ServiceCombException exception = Assertions.assertThrows(ServiceCombException.class, () -> result = discoveryTree.discovery(context, null, null, null)); Assertions.assertEquals(filter.getClass().getName() + " discovery return null.", exception.getMessage()); + DiscoveryManager.renewInstance(); } @Test @@ -331,5 +333,6 @@ public void test_one_service_concurrent_correct() throws Exception { countDownLatch.await(3000, TimeUnit.MILLISECONDS); Assertions.assertEquals(1000, success.get()); + DiscoveryManager.renewInstance(); } } diff --git a/foundations/foundation-spi/pom.xml b/foundations/foundation-spi/pom.xml index 1f1dc2b0039..0e8dd167e6c 100644 --- a/foundations/foundation-spi/pom.xml +++ b/foundations/foundation-spi/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb foundations - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT foundation-spi Java Chassis::Foundations::SSL diff --git a/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderLoader.java b/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderLoader.java index 39e0bfa1a5d..af1e4b1a26c 100644 --- a/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderLoader.java +++ b/foundations/foundation-spi/src/main/java/org/apache/servicecomb/foundation/auth/AuthHeaderLoader.java @@ -29,6 +29,9 @@ public class AuthHeaderLoader { private static final AuthHeaderLoader INSTANCE = new AuthHeaderLoader(); + private AuthHeaderLoader() { + } + public static AuthHeaderLoader getInstance() { return INSTANCE; } diff --git a/foundations/foundation-ssl/pom.xml b/foundations/foundation-ssl/pom.xml index b5802336d3d..84bf5116c1e 100644 --- a/foundations/foundation-ssl/pom.xml +++ b/foundations/foundation-ssl/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb foundations - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT foundation-ssl Java Chassis::Foundations::SSL diff --git a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java index f7d046f6562..5178f989ed2 100644 --- a/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java +++ b/foundations/foundation-ssl/src/test/java/org/apache/servicecomb/foundation/ssl/KeyStoreUtilTest.java @@ -78,7 +78,7 @@ public void testCreateKeyManagersException() { try { KeyStoreUtil.createKeyManagers(keystore, storeKeyValue); } catch (IllegalArgumentException e) { - if (SystemUtils.JAVA_SPECIFICATION_VERSION.startsWith("17")) { + if (Integer.parseInt(SystemUtils.JAVA_SPECIFICATION_VERSION) >= 17) { Assertions.assertEquals("Bad key store.Get Key failed:" + " Cannot read the array length because \"password\" is null", e.getMessage()); diff --git a/foundations/foundation-test-scaffolding/pom.xml b/foundations/foundation-test-scaffolding/pom.xml index f07b0059cbd..e32fa601aed 100644 --- a/foundations/foundation-test-scaffolding/pom.xml +++ b/foundations/foundation-test-scaffolding/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb foundations - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT foundation-test-scaffolding Java Chassis::Foundations::Test Scaffolding diff --git a/foundations/foundation-vertx/pom.xml b/foundations/foundation-vertx/pom.xml index c01e61f7665..f9bcd9a25fa 100644 --- a/foundations/foundation-vertx/pom.xml +++ b/foundations/foundation-vertx/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb foundations - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT foundation-vertx Java Chassis::Foundations::Vertx diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SimpleBodyHandler.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SimpleBodyHandler.java index afced60db00..7f089ead415 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SimpleBodyHandler.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/SimpleBodyHandler.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.foundation.vertx; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.http.HttpHeaders; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java index c8752949ddc..64445db189e 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/client/http/HttpClientPoolFactory.java @@ -46,7 +46,7 @@ public HttpClientWithContext createClientPool(Context context) { connection.localAddress(), connection.remoteAddress()) ); connection.exceptionHandler(e -> - LOGGER.info("http connection exception, local:{}, remote:{}.", + LOGGER.error("http connection exception, local:{}, remote:{}.", connection.localAddress(), connection.remoteAddress(), e) ); }); diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java index ac71310e69d..058a9390464 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletRequest.java @@ -28,19 +28,20 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; public abstract class AbstractHttpServletRequest extends BodyBufferSupportImpl implements HttpServletRequestEx { private final Map attributeMap = new HashMap<>(); @@ -65,6 +66,21 @@ public void setCharacterEncoding(String env) throws UnsupportedEncodingException throw new Error("not supported method"); } + @Override + public String getRequestId() { + throw new Error("not supported method"); + } + + @Override + public String getProtocolRequestId() { + throw new Error("not supported method"); + } + + @Override + public ServletConnection getServletConnection() { + throw new Error("not supported method"); + } + @Override public int getContentLength() { throw new Error("not supported method"); @@ -170,12 +186,6 @@ public RequestDispatcher getRequestDispatcher(String path) { throw new Error("not supported method"); } - @Override - @Deprecated - public String getRealPath(String path) { - throw new Error("not supported method"); - } - @Override public int getRemotePort() { throw new Error("not supported method"); @@ -357,12 +367,6 @@ public boolean isRequestedSessionIdFromURL() { throw new Error("not supported method"); } - @Override - @Deprecated - public boolean isRequestedSessionIdFromUrl() { - throw new Error("not supported method"); - } - @Override public boolean authenticate(HttpServletResponse response) throws IOException, ServletException { throw new Error("not supported method"); diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java index 34a6088f784..2a0559baba6 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/AbstractHttpServletResponse.java @@ -25,10 +25,10 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.Part; -import javax.ws.rs.core.Response.StatusType; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.Response.StatusType; public abstract class AbstractHttpServletResponse extends BodyBufferSupportImpl implements HttpServletResponseEx { private final Map attributes = new HashMap<>(); @@ -133,18 +133,6 @@ public String encodeRedirectURL(String url) { throw new Error("not supported method"); } - @Override - @Deprecated - public String encodeUrl(String url) { - throw new Error("not supported method"); - } - - @Override - @Deprecated - public String encodeRedirectUrl(String url) { - throw new Error("not supported method"); - } - @Override public void sendError(int sc, String msg) throws IOException { throw new Error("not supported method"); @@ -195,12 +183,6 @@ public void setStatus(int sc) { throw new Error("not supported method"); } - @Override - @Deprecated - public void setStatus(int sc, String sm) { - throw new Error("not supported method"); - } - @Override public int getStatus() { throw new Error("not supported method"); diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/DownloadUtils.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/DownloadUtils.java index e83e65e6471..7c9c0fffbfc 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/DownloadUtils.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/DownloadUtils.java @@ -18,7 +18,7 @@ import java.io.IOException; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.http.HttpUtils; import org.apache.servicecomb.foundation.common.part.FilePartForSend; @@ -51,11 +51,11 @@ public static void prepareDownloadHeader(HttpServletResponseEx responseEx, Part } } - if (responseEx.getHeader(javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION) == null) { + if (responseEx.getHeader(jakarta.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION) == null) { // to support chinese and space filename in firefox // must use "filename*", (https://tools.ietf.org/html/rtf6266) String encodedFileName = HttpUtils.uriEncodePath(part.getSubmittedFileName()); - responseEx.setHeader(javax.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION, + responseEx.setHeader(jakarta.ws.rs.core.HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + encodedFileName + ";filename*=utf-8''" + encodedFileName); } } diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/EmptyAsyncContext.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/EmptyAsyncContext.java index dd9f6acf0f2..142435ead3e 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/EmptyAsyncContext.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/EmptyAsyncContext.java @@ -17,12 +17,12 @@ package org.apache.servicecomb.foundation.vertx.http; -import javax.servlet.AsyncContext; -import javax.servlet.AsyncListener; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; public class EmptyAsyncContext implements AsyncContext { @Override diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletRequestEx.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletRequestEx.java index d2f62f2b0fe..701b117ab6c 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletRequestEx.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletRequestEx.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.foundation.vertx.http; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; public interface HttpServletRequestEx extends HttpServletRequest, BodyBufferSupport { default void setHeader(String name, String value) { diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletResponseEx.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletResponseEx.java index e1c2158d743..265ee658ec1 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletResponseEx.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/HttpServletResponseEx.java @@ -19,9 +19,9 @@ import java.util.concurrent.CompletableFuture; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; -import javax.ws.rs.core.Response.StatusType; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.Response.StatusType; import io.vertx.core.http.HttpHeaders; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java index fe6fdd9133c..81056a1700a 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/ReadStreamPart.java @@ -20,8 +20,8 @@ import java.util.concurrent.CompletableFuture; import java.util.function.Function; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.commons.lang.StringUtils; import org.apache.servicecomb.foundation.common.http.HttpUtils; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java index 30145749fc3..fbcea45e6d6 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletRequestEx.java @@ -30,11 +30,11 @@ import java.util.Map; import java.util.Map.Entry; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MediaType; import com.google.common.annotations.VisibleForTesting; import org.apache.commons.io.IOUtils; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletResponseEx.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletResponseEx.java index e2b51e84d08..fbe459745e9 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletResponseEx.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/StandardHttpServletResponseEx.java @@ -23,13 +23,12 @@ import java.util.Map; import java.util.concurrent.CompletableFuture; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; -import javax.servlet.http.Part; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; -import org.apache.servicecomb.foundation.common.http.HttpStatus; import org.apache.servicecomb.foundation.vertx.stream.PumpFromPart; import io.vertx.core.Context; @@ -67,13 +66,6 @@ public int getBodyBytesLength() { return bodyBuffer.getBodyBytesLength(); } - @SuppressWarnings("deprecation") - @Override - public void setStatus(int sc, String sm) { - super.setStatus(sc, sm); - statusType = new HttpStatus(sc, sm); - } - @Override public void setStatus(int sc) { super.setStatus(sc); diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java index 7e540703f72..8ad0d2e24f3 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientRequestToHttpServletRequest.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.Enumeration; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.foundation.common.http.HttpUtils; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientResponseToHttpServletResponse.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientResponseToHttpServletResponse.java index b1cbef217fe..da7e532174b 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientResponseToHttpServletResponse.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxClientResponseToHttpServletResponse.java @@ -19,8 +19,8 @@ import java.util.Collection; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.foundation.common.http.HttpStatus; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java index 5029769a38e..179d3506b77 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerRequestToHttpServletRequest.java @@ -28,11 +28,11 @@ import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; -import javax.servlet.AsyncContext; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.foundation.common.http.HttpUtils; import org.apache.servicecomb.foundation.vertx.stream.BufferInputStream; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java index 97b07405b39..e0c518b291b 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/http/VertxServerResponseToHttpServletResponse.java @@ -21,9 +21,9 @@ import java.util.Objects; import java.util.concurrent.CompletableFuture; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.StatusType; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.foundation.common.http.HttpStatus; import org.apache.servicecomb.foundation.vertx.stream.PumpFromPart; @@ -51,13 +51,6 @@ public void setContentType(String type) { serverResponse.headers().set(HttpHeaders.CONTENT_TYPE, type); } - @Override - @Deprecated - public void setStatus(int sc, String sm) { - serverResponse.setStatusCode(sc); - serverResponse.setStatusMessage(sm); - } - @Override public void setStatus(int sc) { serverResponse.setStatusCode(sc); diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java index 0bd511c7c01..af9af15e000 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/BufferInputStream.java @@ -20,8 +20,8 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; import io.netty.buffer.ByteBuf; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/PumpFromPart.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/PumpFromPart.java index 07a43549f52..ba7b3182087 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/PumpFromPart.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/stream/PumpFromPart.java @@ -21,7 +21,7 @@ import java.io.OutputStream; import java.util.concurrent.CompletableFuture; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.commons.io.IOUtils; import org.apache.servicecomb.foundation.vertx.http.DownloadUtils; diff --git a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/ws/VertxClientWebSocketResponseToHttpServletResponse.java b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/ws/VertxClientWebSocketResponseToHttpServletResponse.java index c12f2e0ef9d..37d35854f83 100644 --- a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/ws/VertxClientWebSocketResponseToHttpServletResponse.java +++ b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/ws/VertxClientWebSocketResponseToHttpServletResponse.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.Collections; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.foundation.common.http.HttpStatus; import org.apache.servicecomb.foundation.vertx.http.AbstractHttpServletResponse; diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java index 76ede3d9636..8aec460f9c0 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/TestSimpleBodyHandler.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.foundation.vertx; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.junit.After; import org.junit.Before; diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletRequest.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletRequest.java index cf1b0bfd4b8..cbcfde8f655 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletRequest.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletRequest.java @@ -19,7 +19,7 @@ import java.util.Collections; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; @@ -175,13 +175,6 @@ public void testGetRequestDispatcher() { checkError(error); } - @SuppressWarnings("deprecation") - @Test - public void testGetRealPath() { - Error error = Assertions.assertThrows(Error.class, () -> request.getRealPath("")); - checkError(error); - } - @Test public void testGetRemotePort() { Error error = Assertions.assertThrows(Error.class, () -> request.getRemotePort()); @@ -398,13 +391,6 @@ public void testIsRequestedSessionIdFromURL() { checkError(error); } - @SuppressWarnings("deprecation") - @Test - public void testIsRequestedSessionIdFromUrl() { - Error error = Assertions.assertThrows(Error.class, () -> request.isRequestedSessionIdFromUrl()); - checkError(error); - } - @Test public void testAuthenticate() { Error error = Assertions.assertThrows(Error.class, () -> request.authenticate(null)); diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletResponse.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletResponse.java index 9b85cb1c5d4..e6083edd0f8 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletResponse.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestAbstractHttpServletResponse.java @@ -149,20 +149,6 @@ public void testEncodeRedirectURL() { checkError(error); } - @SuppressWarnings("deprecation") - @Test - public void testEncodeUrl() { - Error error = Assertions.assertThrows(Error.class, () -> response.encodeUrl(null)); - checkError(error); - } - - @SuppressWarnings("deprecation") - @Test - public void testEncodeRedirectUrl() { - Error error = Assertions.assertThrows(Error.class, () -> response.encodeRedirectUrl(null)); - checkError(error); - } - @Test public void testSendErrorScAndMsg() { Error error = Assertions.assertThrows(Error.class, () -> response.sendError(0, null)); @@ -223,13 +209,6 @@ public void testSetStatusSc() { checkError(error); } - @SuppressWarnings("deprecation") - @Test - public void testSetStatusScAndSm() { - Error error = Assertions.assertThrows(Error.class, () -> response.setStatus(0, "")); - checkError(error); - } - @Test public void testGetStatus() { Error error = Assertions.assertThrows(Error.class, () -> response.getStatus()); diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java index baaa331ac8b..03d425e353c 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestReadStreamPart.java @@ -24,7 +24,7 @@ import java.util.UUID; import java.util.concurrent.ExecutionException; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.commons.io.FileUtils; import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace; diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletRequestEx.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletRequestEx.java index 299dbf6f5ad..d0adef2ce47 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletRequestEx.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletRequestEx.java @@ -25,10 +25,10 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.HttpMethod; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.ws.rs.HttpMethod; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.io.IOUtils; import org.apache.servicecomb.foundation.vertx.stream.BufferInputStream; diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletResponseEx.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletResponseEx.java index d7b0564ebd4..c672fb28879 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletResponseEx.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestStandardHttpServletResponseEx.java @@ -21,32 +21,29 @@ import java.io.IOException; import java.io.InputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.Part; - -import org.apache.commons.lang.RandomStringUtils; +import org.apache.commons.lang3.RandomStringUtils; import org.apache.servicecomb.foundation.common.part.InputStreamPart; import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace; import org.junit.Before; import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.mockito.Mockito; import io.vertx.core.buffer.Buffer; -import mockit.Expectations; -import mockit.Mock; -import mockit.MockUp; -import mockit.Mocked; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.Part; + public class TestStandardHttpServletResponseEx { - @Mocked HttpServletResponse response; StandardHttpServletResponseEx responseEx; @Before public void setup() { + response = Mockito.mock(HttpServletResponse.class); responseEx = new StandardHttpServletResponseEx(response); } @@ -76,14 +73,6 @@ public void getBodyBytesLength() { Assertions.assertEquals(3, responseEx.getBodyBytesLength()); } - @Test - public void setStatus() { - responseEx.setStatus(200, "ok"); - Assertions.assertEquals(200, responseEx.getStatus()); - Assertions.assertEquals(200, responseEx.getStatusType().getStatusCode()); - Assertions.assertEquals("ok", responseEx.getStatusType().getReasonPhrase()); - } - @Test public void flushBuffer() throws IOException { Buffer buffer = Buffer.buffer(); @@ -99,16 +88,12 @@ public void setWriteListener(WriteListener writeListener) { } @Override - public void write(int b) throws IOException { + public void write(int b) { buffer.appendByte((byte) b); } }; - response = new MockUp() { - @Mock - ServletOutputStream getOutputStream() { - return output; - } - }.getMockInstance(); + + Mockito.when(response.getOutputStream()).thenReturn(output); responseEx = new StandardHttpServletResponseEx(response); // no body @@ -129,23 +114,28 @@ public void attribute() { @Test public void sendPart_succ() throws Throwable { - String src = RandomStringUtils.random(100); + String src = RandomStringUtils.random(100, true, true); InputStream inputStream = new ByteArrayInputStream(src.getBytes()); Part part = new InputStreamPart("name", inputStream); Buffer buffer = Buffer.buffer(); - ServletOutputStream outputStream = new MockUp() { - @Mock - void write(int b) { - buffer.appendByte((byte) b); + + ServletOutputStream outputStream = new ServletOutputStream() { + @Override + public boolean isReady() { + return false; + } + + @Override + public void setWriteListener(WriteListener writeListener) { + } - }.getMockInstance(); - new Expectations() { - { - response.getOutputStream(); - result = outputStream; + @Override + public void write(int b) { + buffer.appendByte((byte) b); } }; + Mockito.when(response.getOutputStream()).thenReturn(outputStream); responseEx.sendPart(part).get(); @@ -153,14 +143,10 @@ void write(int b) { } @Test - public void sendPart_failed(@Mocked Part part) throws Throwable { + public void sendPart_failed() throws Throwable { + Part part = Mockito.mock(Part.class); RuntimeException error = new RuntimeExceptionWithoutStackTrace(); - new Expectations() { - { - response.getOutputStream(); - result = error; - } - }; + Mockito.when(response.getOutputStream()).thenThrow(error); Assertions.assertThrows(RuntimeException.class, () -> responseEx.sendPart(part).get()); } diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java index 881c1b6de23..9cbe78713b3 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientRequestToHttpServletRequest.java @@ -19,7 +19,7 @@ import java.util.Collections; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.foundation.common.http.HttpUtils; import org.hamcrest.MatcherAssert; diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientResponseToHttpServletResponse.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientResponseToHttpServletResponse.java index 1969851f75a..ca204c9b6fc 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientResponseToHttpServletResponse.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxClientResponseToHttpServletResponse.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.foundation.vertx.http; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.StatusType; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java index 7be1f187aa8..9d53cd649da 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerRequestToHttpServletRequest.java @@ -24,10 +24,10 @@ import java.util.Map; import java.util.Set; -import javax.servlet.AsyncContext; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.Cookie; +import jakarta.ws.rs.core.HttpHeaders; import io.vertx.ext.web.RequestBody; import io.vertx.ext.web.impl.RoutingContextInternal; diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java index cf6d5aa95b0..e438da8b024 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/http/TestVertxServerResponseToHttpServletResponse.java @@ -25,9 +25,9 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.StatusType; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.commons.io.FileUtils; import org.apache.servicecomb.foundation.common.http.HttpStatus; @@ -185,9 +185,8 @@ public void setContentType() { @SuppressWarnings("deprecation") @Test public void setStatus() { - response.setStatus(222, "test"); + response.setStatus(222); Assertions.assertEquals(222, httpStatus.getStatusCode()); - Assertions.assertEquals("test", httpStatus.getReasonPhrase()); } @Test @@ -196,7 +195,6 @@ public void getStatusType() { Assertions.assertSame(status, response.getStatusType()); Assertions.assertEquals(123, httpStatus.getStatusCode()); - Assertions.assertEquals("default", httpStatus.getReasonPhrase()); } @Test diff --git a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestPumpFromPart.java b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestPumpFromPart.java index c4c14b50b00..01cd8f7034d 100644 --- a/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestPumpFromPart.java +++ b/foundations/foundation-vertx/src/test/java/org/apache/servicecomb/foundation/vertx/stream/TestPumpFromPart.java @@ -22,7 +22,7 @@ import java.io.OutputStream; import java.util.concurrent.ExecutionException; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.RandomStringUtils; diff --git a/foundations/pom.xml b/foundations/pom.xml index f49c9fab792..462559493c5 100644 --- a/foundations/pom.xml +++ b/foundations/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default foundations diff --git a/governance/pom.xml b/governance/pom.xml index 2e5dae09f43..7037bda9a67 100644 --- a/governance/pom.xml +++ b/governance/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/handlers/handler-bizkeeper/pom.xml b/handlers/handler-bizkeeper/pom.xml index c69e3a6847b..bf3ac4e7e30 100644 --- a/handlers/handler-bizkeeper/pom.xml +++ b/handlers/handler-bizkeeper/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb handlers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT handler-bizkeeper @@ -55,11 +55,6 @@ log4j test - - org.mockito - mockito-inline - test - org.apache.servicecomb foundation-test-scaffolding diff --git a/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestFallbackPolicyManager.java b/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestFallbackPolicyManager.java index d5bfc10e68c..2db7acc5925 100644 --- a/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestFallbackPolicyManager.java +++ b/handlers/handler-bizkeeper/src/test/java/org/apache/servicecomb/bizkeeper/TestFallbackPolicyManager.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.bizkeeper; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.definition.OperationMeta; diff --git a/handlers/handler-fault-injection/pom.xml b/handlers/handler-fault-injection/pom.xml index e8a7217a2df..31fb8922c60 100755 --- a/handlers/handler-fault-injection/pom.xml +++ b/handlers/handler-fault-injection/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb handlers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT handler-fault-injection Java Chassis::Handlers::Fault Injection diff --git a/handlers/handler-flowcontrol-qps/pom.xml b/handlers/handler-flowcontrol-qps/pom.xml index 89f3990856d..443137a9f8f 100644 --- a/handlers/handler-flowcontrol-qps/pom.xml +++ b/handlers/handler-flowcontrol-qps/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb handlers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT handler-flowcontrol-qps Java Chassis::Handlers::Flow Control QPS diff --git a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/QpsConst.java b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/QpsConst.java index 6dae2f4133d..ab1713ec497 100644 --- a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/QpsConst.java +++ b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/QpsConst.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.qps; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.context.HttpStatus; diff --git a/handlers/handler-governance/pom.xml b/handlers/handler-governance/pom.xml index fdd0f89310d..33ac98372d9 100644 --- a/handlers/handler-governance/pom.xml +++ b/handlers/handler-governance/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb handlers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT handler-governance diff --git a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationHandler.java b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationHandler.java index 2a1d2ea3ff5..64cdf160617 100644 --- a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationHandler.java +++ b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationHandler.java @@ -22,7 +22,7 @@ import java.util.concurrent.CompletionStage; import java.util.function.Supplier; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.Handler; import org.apache.servicecomb.core.Invocation; diff --git a/handlers/handler-loadbalance/pom.xml b/handlers/handler-loadbalance/pom.xml index 618ebb8bd1d..37f59f259f5 100644 --- a/handlers/handler-loadbalance/pom.xml +++ b/handlers/handler-loadbalance/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb handlers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT handler-loadbalance diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java index e93f5a1f20d..4d8e943a808 100644 --- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java +++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Objects; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import com.google.common.annotations.VisibleForTesting; import org.apache.commons.lang3.StringUtils; diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilter.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilter.java index ea98ca7376d..5b5fa42a87d 100644 --- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilter.java +++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/PriorityInstancePropertyDiscoveryFilter.java @@ -22,7 +22,7 @@ import java.util.Objects; import java.util.Optional; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.core.Invocation; diff --git a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java index 232f99ee0c5..b3d45420d77 100644 --- a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java +++ b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadbalanceHandler.java @@ -23,7 +23,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.config.ConfigUtil; import org.apache.servicecomb.core.Invocation; diff --git a/handlers/handler-publickey-auth/pom.xml b/handlers/handler-publickey-auth/pom.xml index 5ea013ed980..2e258085b8a 100644 --- a/handlers/handler-publickey-auth/pom.xml +++ b/handlers/handler-publickey-auth/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb handlers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT handler-publickey-auth @@ -56,11 +56,6 @@ foundation-test-scaffolding test - - org.mockito - mockito-inline - test - diff --git a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthHandler.java b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthHandler.java index e5f59e00854..d0b0859a138 100644 --- a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthHandler.java +++ b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthHandler.java @@ -18,7 +18,7 @@ import java.util.Optional; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.Const; import org.apache.servicecomb.core.Handler; diff --git a/handlers/handler-router/pom.xml b/handlers/handler-router/pom.xml index 737d3663996..762bbf920d2 100644 --- a/handlers/handler-router/pom.xml +++ b/handlers/handler-router/pom.xml @@ -22,7 +22,7 @@ handlers org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/handlers/handler-tracing-zipkin/pom.xml b/handlers/handler-tracing-zipkin/pom.xml index 60377d5b6a0..621a906d1ca 100644 --- a/handlers/handler-tracing-zipkin/pom.xml +++ b/handlers/handler-tracing-zipkin/pom.xml @@ -22,7 +22,7 @@ handlers org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 @@ -64,9 +64,8 @@ compile - io.zipkin.zipkin2 - zipkin-junit - test + io.zipkin.reporter2 + zipkin-reporter-brave diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/LogSpanHandler.java similarity index 56% rename from providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java rename to handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/LogSpanHandler.java index 5c81868e866..93499ec9209 100644 --- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactoryTest.java +++ b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/LogSpanHandler.java @@ -14,20 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +package org.apache.servicecomb.tracing.zipkin; -package org.apache.servicecomb.provider.springmvc.reference.async; -import java.net.URI; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.springframework.http.HttpMethod; +import brave.handler.MutableSpan; +import brave.handler.SpanHandler; +import brave.propagation.TraceContext; -public class CseAsyncClientHttpRequestFactoryTest { - @Test - public void testCseAsyncClientHttpRequestFactory() { - CseAsyncClientHttpRequestFactory cseAsyncClientHttpRequestFactory = new CseAsyncClientHttpRequestFactory(); - Assertions.assertEquals(HttpMethod.GET, - cseAsyncClientHttpRequestFactory.createAsyncRequest(URI.create("/test"), HttpMethod.GET).getMethod()); +public class LogSpanHandler extends SpanHandler { + private static final Logger LOGGER = LoggerFactory.getLogger("scb-trace"); + + public boolean end(TraceContext context, MutableSpan span, Cause cause) { + if (!LOGGER.isInfoEnabled()) { + return false; + } else { + LOGGER.info(span.toString()); + return true; + } + } + + public String toString() { + return "LogSpanHandler{name=scb-trace}"; } } diff --git a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java index 4d63ed2c160..d3ca3b8cf6e 100644 --- a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java +++ b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java @@ -34,6 +34,7 @@ import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.foundation.common.net.URIEndpointObject; import org.apache.servicecomb.registry.definition.DefinitionConst; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -43,10 +44,11 @@ import brave.propagation.CurrentTraceContext; import brave.propagation.ThreadLocalCurrentTraceContext; import zipkin2.Span; -import zipkin2.codec.SpanBytesEncoder; import zipkin2.reporter.AsyncReporter; +import zipkin2.reporter.BytesMessageSender; import zipkin2.reporter.Reporter; import zipkin2.reporter.Sender; +import zipkin2.reporter.SpanBytesEncoder; import zipkin2.reporter.brave.AsyncZipkinSpanHandler; import zipkin2.reporter.okhttp3.OkHttpSender; @@ -54,7 +56,13 @@ class TracingConfiguration { private String apiVersion = CONFIG_TRACING_COLLECTOR_API_V2; - public static final String TRACING_WORK_WITH_THIRDPARTY = "servicecomb.tracing.workWithThirdParty"; + public static final String TRACING_PREFIX = "servicecomb.tracing"; + + public static final String TRACING_WORK_WITH_THIRDPARTY = TRACING_PREFIX + ".workWithThirdParty"; + + public static final String TRACING_REPORTER_LOG_ENABLED = TRACING_PREFIX + ".reporter.log.enabled"; + + public static final String TRACING_REPORTER_ZIPKIN_ENABLED = TRACING_PREFIX + ".reporter.zipkin.enabled"; @Bean Sender sender(DynamicProperties dynamicProperties) { @@ -76,7 +84,9 @@ Sender sender(DynamicProperties dynamicProperties) { } @Bean - Reporter zipkinReporter(Sender sender) { + Reporter zipkinReporter(DynamicProperties dynamicProperties, BytesMessageSender sender) { + String apiVersion = dynamicProperties.getStringProperty(CONFIG_TRACING_COLLECTOR_API_VERSION, + CONFIG_TRACING_COLLECTOR_API_V2).toLowerCase(); if (apiVersion.compareTo(CONFIG_TRACING_COLLECTOR_API_V1) == 0) { return AsyncReporter.builder(sender).build(SpanBytesEncoder.JSON_V1); } @@ -86,13 +96,18 @@ Reporter zipkinReporter(Sender sender) { @Bean - Tracing tracing(Sender sender, DynamicProperties dynamicProperties, - CurrentTraceContext currentTraceContext) { - return Tracing.newBuilder() + Tracing Tracing(@Autowired(required = false) Sender sender, + CurrentTraceContext currentTraceContext, DynamicProperties dynamicProperties) { + Tracing.Builder builder = Tracing.newBuilder() .localServiceName(BootStrapProperties.readServiceName()) - .currentTraceContext(currentTraceContext) // puts trace IDs into logs - .addSpanHandler(AsyncZipkinSpanHandler.create(sender)) - .build(); + .currentTraceContext(currentTraceContext); // puts trace IDs into logs + if (dynamicProperties.getBooleanProperty(TRACING_REPORTER_LOG_ENABLED, true)) { + builder.addSpanHandler(new LogSpanHandler()); + } + if (dynamicProperties.getBooleanProperty(TRACING_REPORTER_ZIPKIN_ENABLED, false)) { + builder.addSpanHandler(AsyncZipkinSpanHandler.create(sender)); + } + return builder.build(); } @Bean diff --git a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java index 6dd8d5442c2..7369bf27472 100644 --- a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java +++ b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/ZipkinTracingFilter.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.exception.Exceptions; diff --git a/handlers/pom.xml b/handlers/pom.xml index d0fa5492fa8..065d32fd69d 100644 --- a/handlers/pom.xml +++ b/handlers/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/huawei-cloud/darklaunch/pom.xml b/huawei-cloud/darklaunch/pom.xml index 4e62b9cca90..7acf4d58b34 100644 --- a/huawei-cloud/darklaunch/pom.xml +++ b/huawei-cloud/darklaunch/pom.xml @@ -21,7 +21,7 @@ huawei-cloud org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/huawei-cloud/dashboard/pom.xml b/huawei-cloud/dashboard/pom.xml index f877b98bd84..ca16a0c4723 100644 --- a/huawei-cloud/dashboard/pom.xml +++ b/huawei-cloud/dashboard/pom.xml @@ -21,7 +21,7 @@ huawei-cloud org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/huawei-cloud/environment/pom.xml b/huawei-cloud/environment/pom.xml index bc8d7e60cae..4eafdc8d235 100644 --- a/huawei-cloud/environment/pom.xml +++ b/huawei-cloud/environment/pom.xml @@ -21,7 +21,7 @@ huawei-cloud org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 servicestage-environment diff --git a/huawei-cloud/pom.xml b/huawei-cloud/pom.xml index e0c635aadd1..377f66aa779 100644 --- a/huawei-cloud/pom.xml +++ b/huawei-cloud/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default diff --git a/huawei-cloud/servicestage/pom.xml b/huawei-cloud/servicestage/pom.xml index 0740ccec9df..23531946c77 100644 --- a/huawei-cloud/servicestage/pom.xml +++ b/huawei-cloud/servicestage/pom.xml @@ -21,7 +21,7 @@ huawei-cloud org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 servicestage diff --git a/inspector/pom.xml b/inspector/pom.xml index 2533cebc8ac..f3c45eb401e 100644 --- a/inspector/pom.xml +++ b/inspector/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 @@ -58,10 +58,5 @@ transport-rest-servlet test - - org.mockito - mockito-inline - test - diff --git a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java index 88581c4058b..562c3b4e249 100644 --- a/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java +++ b/inspector/src/main/java/org/apache/servicecomb/inspector/internal/InspectorImpl.java @@ -33,14 +33,14 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; -import javax.servlet.http.Part; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.resource.ClassPathStaticResourceHandler; diff --git a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java index c08c9f52bac..93e86f04eaf 100644 --- a/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java +++ b/inspector/src/test/java/org/apache/servicecomb/inspector/internal/TestInspectorImpl.java @@ -29,10 +29,10 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/metrics/metrics-core/pom.xml b/metrics/metrics-core/pom.xml index bc6e948f4a5..f70c0818b1f 100644 --- a/metrics/metrics-core/pom.xml +++ b/metrics/metrics-core/pom.xml @@ -21,7 +21,7 @@ metrics org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/HealthCheckerRestPublisher.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/HealthCheckerRestPublisher.java index ccc76438ef8..66d91aabcba 100644 --- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/HealthCheckerRestPublisher.java +++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/HealthCheckerRestPublisher.java @@ -19,8 +19,8 @@ import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.servicecomb.foundation.metrics.health.HealthCheckResult; import org.apache.servicecomb.foundation.metrics.health.HealthCheckerManager; diff --git a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/MetricsRestPublisher.java b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/MetricsRestPublisher.java index 629b171b7b7..677f9ed0f78 100644 --- a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/MetricsRestPublisher.java +++ b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/MetricsRestPublisher.java @@ -22,8 +22,8 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.servicecomb.foundation.metrics.MetricsBootstrapConfig; import org.apache.servicecomb.foundation.metrics.MetricsInitializer; diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java index 51752617a90..c7490b91e87 100644 --- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java +++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestDefaultLogPublisher.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.stream.Collectors; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.log4j.spi.LoggingEvent; import org.apache.servicecomb.core.Const; diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java index 600cd488719..32a09c4e420 100644 --- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java +++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/TestPublishUtils.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.Const; import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementNode; diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java index 2f56014061a..2cfe97e3e56 100644 --- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java +++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/TestOperationPerfGroup.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.metrics.core.publish.model.invocation; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.core.Const; import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst; diff --git a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/Utils.java b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/Utils.java index 7123b4de674..f8dcd649c77 100644 --- a/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/Utils.java +++ b/metrics/metrics-core/src/test/java/org/apache/servicecomb/metrics/core/publish/model/invocation/Utils.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.List; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.foundation.metrics.publish.spectator.MeasurementNode; import org.apache.servicecomb.metrics.core.meter.invocation.MeterInvocationConst; diff --git a/metrics/metrics-integration/metrics-prometheus/pom.xml b/metrics/metrics-integration/metrics-prometheus/pom.xml index 76d4ad9fec8..63bca7d6b01 100644 --- a/metrics/metrics-integration/metrics-prometheus/pom.xml +++ b/metrics/metrics-integration/metrics-prometheus/pom.xml @@ -21,7 +21,7 @@ metrics-integration org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/metrics/metrics-integration/pom.xml b/metrics/metrics-integration/pom.xml index 0d535c064c2..cc33256c688 100644 --- a/metrics/metrics-integration/pom.xml +++ b/metrics/metrics-integration/pom.xml @@ -22,7 +22,7 @@ metrics org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/metrics/pom.xml b/metrics/pom.xml index 136f8eef674..7ba25f02986 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default diff --git a/parents/default/pom.xml b/parents/default/pom.xml index a1c8aefb97c..4cf66156761 100644 --- a/parents/default/pom.xml +++ b/parents/default/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb java-chassis-dependencies - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../../dependencies/default diff --git a/parents/pom.xml b/parents/pom.xml index c080d8d8ca4..a7feeb26478 100644 --- a/parents/pom.xml +++ b/parents/pom.xml @@ -24,7 +24,7 @@ org.apache.servicecomb java-chassis - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT java-chassis-parents diff --git a/pom.xml b/pom.xml index 941b88ff988..03e5907ab33 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.apache.servicecomb java-chassis - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT pom ServiceComb Java Chassis @@ -37,8 +37,10 @@ https://github.com/apache/servicecomb-java-chassis + 21 + 21 UTF-8 - 1.8 + 21 -Dfile.encoding=UTF-8 true @@ -51,25 +53,25 @@ 3.1.0 2.1.0 3.0.1 - 0.8.8 + 0.8.12 3.4.1 2.5 - 3.10.1 - 3.0.0-M7 - 3.3.0 - 3.4.1 - 3.0.0 + 3.13.0 + 3.5.2 + 3.4.2 + 3.8.0 + 3.2.0 1.7.1 0.6.1 3.19.2 1.47.0 10.5.0 - 2.5.3 - 3.12.1 - 3.2.1 - 4.7.3.0 - 2.7.7 - 3.0.0-M7 + 3.1.1 + 3.21.0 + 3.3.0 + 4.8.6.6 + 3.4.4 + 3.5.2 diff --git a/providers/pom.xml b/providers/pom.xml index ffb0b41a360..f10b186e89e 100644 --- a/providers/pom.xml +++ b/providers/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default providers diff --git a/providers/provider-jaxrs/pom.xml b/providers/provider-jaxrs/pom.xml index 604594089cd..8c511c6ff8b 100644 --- a/providers/provider-jaxrs/pom.xml +++ b/providers/provider-jaxrs/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb providers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT provider-jaxrs Java Chassis::Providers::JAXRS diff --git a/providers/provider-pojo/pom.xml b/providers/provider-pojo/pom.xml index 2720756c91a..a0a1411aa22 100644 --- a/providers/provider-pojo/pom.xml +++ b/providers/provider-pojo/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb providers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT provider-pojo Java Chassis::Providers::POJO @@ -55,10 +55,5 @@ jaxb-api test - - org.mockito - mockito-inline - test - diff --git a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/FilterInvocationCaller.java b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/FilterInvocationCaller.java index 052d4c10b76..c5b2b8f59ff 100644 --- a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/FilterInvocationCaller.java +++ b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/FilterInvocationCaller.java @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.exception.Exceptions; import org.apache.servicecomb.core.provider.consumer.InvokerUtils; diff --git a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/PojoConsumerMetaRefresher.java b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/PojoConsumerMetaRefresher.java index ef31036311d..3bb449042b2 100644 --- a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/PojoConsumerMetaRefresher.java +++ b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/PojoConsumerMetaRefresher.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.provider.pojo; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.core.SCBEngine; diff --git a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerMeta.java b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerMeta.java index db061fef7e4..edce9dc09b5 100644 --- a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerMeta.java +++ b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerMeta.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.definition.MicroserviceMeta; import org.apache.servicecomb.core.definition.OperationMeta; diff --git a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerOperationMeta.java b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerOperationMeta.java index 4c37885e094..1d5bf5fed93 100644 --- a/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerOperationMeta.java +++ b/providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/definition/PojoConsumerOperationMeta.java @@ -20,7 +20,7 @@ import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.core.definition.InvocationRuntimeType; import org.apache.servicecomb.core.definition.OperationMeta; diff --git a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java index 971781522eb..3f3edc6ca3c 100644 --- a/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java +++ b/providers/provider-pojo/src/test/java/org/apache/servicecomb/provider/pojo/TestInvoker.java @@ -29,7 +29,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import java.io.File; import java.lang.reflect.Method; diff --git a/providers/provider-rest-common/pom.xml b/providers/provider-rest-common/pom.xml index fba62ed60ca..02785b600dd 100644 --- a/providers/provider-rest-common/pom.xml +++ b/providers/provider-rest-common/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb providers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT provider-rest-common Java Chassis::Providers::Rest Common @@ -49,10 +49,5 @@ org.apache.servicecomb foundation-test-scaffolding - - org.mockito - mockito-inline - test - diff --git a/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapper.java b/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapper.java index 8fd4d0a7acf..2e9ac697393 100644 --- a/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapper.java +++ b/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapper.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.provider.rest.common; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.core.Invocation; diff --git a/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapperFactory.java b/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapperFactory.java index cc28319b5e8..b830af1bd10 100644 --- a/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapperFactory.java +++ b/providers/provider-rest-common/src/main/java/org/apache/servicecomb/provider/rest/common/ProducerHttpRequestArgMapperFactory.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.provider.rest.common; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.swagger.invocation.arguments.ArgumentMapper; import org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerContextArgumentMapperFactory; diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java index cba3c660ecf..ab5ce8ec622 100644 --- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java +++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestInvocationToHttpServletRequest.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.definition.RestOperationMeta; diff --git a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java index f338850d65f..ba11c447897 100644 --- a/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java +++ b/providers/provider-rest-common/src/test/java/org/apache/servicecomb/provider/rest/common/TestProducerHttpRequestArgMapper.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.definition.RestOperationMeta; diff --git a/providers/provider-springmvc/pom.xml b/providers/provider-springmvc/pom.xml index f43d8f17f65..257ec7502a3 100644 --- a/providers/provider-springmvc/pom.xml +++ b/providers/provider-springmvc/pom.xml @@ -23,7 +23,7 @@ org.apache.servicecomb providers - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT provider-springmvc Java Chassis::Providers::Spring MVC @@ -66,10 +66,5 @@ jaxb-api test - - org.mockito - mockito-inline - test - diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CommonToHttpServletRequest.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CommonToHttpServletRequest.java index 69834eb730c..47e2a707efd 100644 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CommonToHttpServletRequest.java +++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CommonToHttpServletRequest.java @@ -29,10 +29,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletInputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.foundation.vertx.http.AbstractHttpServletRequest; diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java index e5b370729bf..e68a59645f1 100644 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java +++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/CseClientHttpRequest.java @@ -20,11 +20,12 @@ import java.io.OutputStream; import java.lang.reflect.Type; import java.net.URI; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; import com.google.common.annotations.VisibleForTesting; import org.apache.servicecomb.common.rest.RestConst; @@ -75,6 +76,8 @@ public class CseClientHttpRequest implements ClientHttpRequest { private Type responseType; + private final Map attributes = new LinkedHashMap<>(); + public CseClientHttpRequest() { } @@ -143,11 +146,6 @@ public HttpMethod getMethod() { return method; } - @Override - public String getMethodValue() { - return method.name(); - } - @Override public URI getURI() { return uri; @@ -163,6 +161,11 @@ public OutputStream getBody() { return null; } + @Override + public Map getAttributes() { + return attributes; + } + @Override public ClientHttpResponse execute() { path = findUriPath(uri); diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/RestTemplateWrapper.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/RestTemplateWrapper.java index 6d50d9ffd17..c50b5d38593 100644 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/RestTemplateWrapper.java +++ b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/RestTemplateWrapper.java @@ -29,6 +29,7 @@ import org.springframework.http.HttpMethod; import org.springframework.http.RequestEntity; import org.springframework.http.ResponseEntity; +import org.springframework.http.client.BufferingClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.http.converter.HttpMessageConverter; @@ -46,10 +47,13 @@ class RestTemplateWrapper extends RestTemplate { private final List acceptableRestTemplates = new ArrayList<>(); - final RestTemplate defaultRestTemplate = new RestTemplate(); + final RestTemplate defaultRestTemplate; RestTemplateWrapper() { acceptableRestTemplates.add(new CseRestTemplate()); + defaultRestTemplate = new RestTemplate(); + defaultRestTemplate + .setRequestFactory(new BufferingClientHttpRequestFactory(defaultRestTemplate.getRequestFactory())); } void addAcceptableRestTemplate(int index, AcceptableRestTemplate restTemplate) { diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequest.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequest.java deleted file mode 100644 index f84436e5217..00000000000 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequest.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.provider.springmvc.reference.async; - -import java.io.OutputStream; -import java.net.URI; -import java.util.Map; -import java.util.concurrent.CompletableFuture; - -import org.apache.servicecomb.common.rest.RestConst; -import org.apache.servicecomb.core.Invocation; -import org.apache.servicecomb.core.provider.consumer.InvokerUtils; -import org.apache.servicecomb.provider.springmvc.reference.CseClientHttpRequest; -import org.apache.servicecomb.provider.springmvc.reference.CseClientHttpResponse; -import org.apache.servicecomb.swagger.invocation.Response; -import org.springframework.http.HttpMethod; -import org.springframework.http.client.ClientHttpResponse; -import org.springframework.util.concurrent.CompletableToListenableFutureAdapter; -import org.springframework.util.concurrent.ListenableFuture; - -import io.netty.handler.codec.http.QueryStringDecoder; - -@SuppressWarnings("deprecation") -// TODO : upgrade to spring 5 will having warning's , we'll fix it later -public class CseAsyncClientHttpRequest extends CseClientHttpRequest implements - org.springframework.http.client.AsyncClientHttpRequest { - - CseAsyncClientHttpRequest() { - } - - protected CseAsyncClientHttpRequest(URI uri, HttpMethod method) { - this.setUri(uri); - this.setMethod(method); - } - - @Override - public OutputStream getBody() { - return null; - } - - private ListenableFuture invoke(Map swaggerArguments) { - Invocation invocation = prepareInvocation(swaggerArguments); - invocation.getHandlerContext().put(RestConst.CONSUMER_HEADER, this.getHeaders()); - CompletableFuture clientHttpResponseCompletableFuture = doAsyncInvoke(invocation); - return new CompletableToListenableFutureAdapter<>(clientHttpResponseCompletableFuture); - } - - protected CompletableFuture doAsyncInvoke(Invocation invocation) { - CompletableFuture completableFuture = new CompletableFuture<>(); - InvokerUtils.reactiveInvoke(invocation, (Response response) -> { - if (response.isSucceed()) { - completableFuture.complete(new CseClientHttpResponse(response)); - } else { - completableFuture.completeExceptionally(response.getResult()); - } - }); - return completableFuture; - } - - @Override - public ListenableFuture executeAsync() { - this.setPath(findUriPath(this.getURI())); - this.setRequestMeta(createRequestMeta(this.getMethod().name(), this.getURI())); - QueryStringDecoder queryStringDecoder = new QueryStringDecoder(this.getURI().getRawSchemeSpecificPart()); - this.setQueryParams(queryStringDecoder.parameters()); - Map swaggerArguments = this.collectArguments(); - return this.invoke(swaggerArguments); - } -} diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactory.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactory.java deleted file mode 100644 index 02993262896..00000000000 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestFactory.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.provider.springmvc.reference.async; - -import java.net.URI; - -import org.springframework.http.HttpMethod; - -@SuppressWarnings("deprecation") -// TODO : upgrade to spring 5 will having warning's , we'll fix it later -public class CseAsyncClientHttpRequestFactory implements org.springframework.http.client.AsyncClientHttpRequestFactory { - @Override - public org.springframework.http.client.AsyncClientHttpRequest createAsyncRequest(URI uri, HttpMethod httpMethod) { - return new CseAsyncClientHttpRequest(uri, httpMethod); - } -} diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallback.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallback.java deleted file mode 100644 index 76199f5cc59..00000000000 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallback.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.provider.springmvc.reference.async; - -import org.apache.servicecomb.provider.springmvc.reference.CseHttpEntity; -import org.springframework.http.HttpEntity; - -@SuppressWarnings("deprecation") -// TODO : upgrade to spring 5 will having warning's , we'll fix it later -public class CseAsyncRequestCallback implements org.springframework.web.client.AsyncRequestCallback { - private final HttpEntity requestBody; - - CseAsyncRequestCallback(HttpEntity requestBody) { - this.requestBody = requestBody; - } - - @Override - @SuppressWarnings("deprecation") -// TODO : upgrade to spring 5 will having warning's , we'll fix it later - public void doWithRequest(org.springframework.http.client.AsyncClientHttpRequest request) { - CseAsyncClientHttpRequest cseAsyncClientHttpRequest = (CseAsyncClientHttpRequest) request; - if (requestBody != null) { - cseAsyncClientHttpRequest.setRequestBody(requestBody.getBody()); - cseAsyncClientHttpRequest.setHttpHeaders(requestBody.getHeaders()); - } - - if (!CseHttpEntity.class.isInstance(requestBody)) { - return; - } - - CseAsyncClientHttpRequest req = (CseAsyncClientHttpRequest) request; - CseHttpEntity entity = (CseHttpEntity) requestBody; - req.setContext(entity.getContext()); - } -} diff --git a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java b/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java deleted file mode 100644 index 8b4bf924223..00000000000 --- a/providers/provider-springmvc/src/main/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplate.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.provider.springmvc.reference.async; - -import java.lang.reflect.Type; -import java.util.Arrays; - -import org.apache.servicecomb.provider.springmvc.reference.CseHttpMessageConverter; -import org.apache.servicecomb.provider.springmvc.reference.CseRestTemplate; -import org.apache.servicecomb.provider.springmvc.reference.CseUriTemplateHandler; -import org.springframework.core.task.SimpleAsyncTaskExecutor; -import org.springframework.http.HttpEntity; -import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.web.client.RestTemplate; - -@SuppressWarnings("deprecation") -// AsyncRestTemplate is deprecated by spring 5, using RPC with CompletableFuture instead. -// Keep this function is only for compatibility, and maybe removed in future. -public class CseAsyncRestTemplate extends org.springframework.web.client.AsyncRestTemplate { - public CseAsyncRestTemplate() { - super(createSimpleClientHttpRequestFactory(), createRestTemplate()); - setMessageConverters(Arrays.asList(new CseHttpMessageConverter())); - setAsyncRequestFactory(new CseAsyncClientHttpRequestFactory()); - setUriTemplateHandler(new CseUriTemplateHandler()); - } - - private static SimpleClientHttpRequestFactory createSimpleClientHttpRequestFactory() { - SimpleClientHttpRequestFactory requestFactory = new SimpleClientHttpRequestFactory(); - requestFactory.setTaskExecutor(new SimpleAsyncTaskExecutor()); - return requestFactory; - } - - private static RestTemplate createRestTemplate() { - return new CseRestTemplate(); - } - - @Override - protected org.springframework.web.client.AsyncRequestCallback httpEntityCallback(HttpEntity requestBody) { - return new CseAsyncRequestCallback<>(requestBody); - } - - @Override - protected org.springframework.web.client.AsyncRequestCallback httpEntityCallback(HttpEntity requestBody, - Type responseType) { - return new CseAsyncRequestCallback<>(requestBody); - } -} diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java index 7eae1b16237..e249086527e 100644 --- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java +++ b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/TestCommonToHttpServletRequest.java @@ -27,10 +27,10 @@ import java.util.List; import java.util.Map; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx; diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java deleted file mode 100644 index 6045044b0c2..00000000000 --- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncClientHttpRequestTest.java +++ /dev/null @@ -1,129 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.provider.springmvc.reference.async; - -import java.net.URI; -import java.util.concurrent.CompletableFuture; - -import org.apache.servicecomb.config.ConfigUtil; -import org.apache.servicecomb.core.Invocation; -import org.apache.servicecomb.core.SCBEngine; -import org.apache.servicecomb.core.bootstrap.SCBBootstrap; -import org.apache.servicecomb.foundation.common.Holder; -import org.apache.servicecomb.foundation.test.scaffolding.config.ArchaiusUtils; -import org.apache.servicecomb.provider.springmvc.reference.CseClientHttpResponse; -import org.apache.servicecomb.registry.DiscoveryManager; -import org.apache.servicecomb.registry.RegistrationManager; -import org.apache.servicecomb.swagger.invocation.Response; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.springframework.http.HttpMethod; -import org.springframework.http.client.ClientHttpResponse; -import org.springframework.util.concurrent.ListenableFuture; -import org.springframework.util.concurrent.ListenableFutureCallback; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; - -public class CseAsyncClientHttpRequestTest { - static SCBEngine scbEngine; - - @BeforeAll - public static void classSetup() { - ConfigUtil.installDynamicConfig(); - scbEngine = SCBBootstrap.createSCBEngineForTest() - .addProducerMeta("sid1", new CseAsyncClientHttpRequestTestSchema()).run(); - } - - @AfterAll - public static void classTeardown() { - scbEngine.destroy(); - DiscoveryManager.renewInstance(); - RegistrationManager.renewInstance(); - ArchaiusUtils.resetConfig(); - } - - @RequestMapping(path = "CseAsyncClientHttpRequestTestSchema") - static class CseAsyncClientHttpRequestTestSchema { - @RequestMapping(path = "/testbytes", method = RequestMethod.POST) - public byte[] testbytes(@RequestBody byte[] input) { - input[0] = (byte) (input[0] + 1); - return input; - } - } - - @Test - public void testNormal() { - Holder holder = new Holder<>(); - CseAsyncClientHttpRequest client = - new CseAsyncClientHttpRequest(URI.create( - "cse://defaultMicroservice/" + CseAsyncClientHttpRequestTest.CseAsyncClientHttpRequestTestSchema.class - .getSimpleName() - + "/testbytes"), - HttpMethod.POST) { - @Override - protected CompletableFuture doAsyncInvoke(Invocation invocation) { - CompletableFuture completableFuture = new CompletableFuture<>(); - holder.value = invocation; - completableFuture.complete(new CseClientHttpResponse(Response.ok("result"))); - return completableFuture; - } - }; - byte[] body = "abc".getBytes(); - client.setRequestBody(body); - client.executeAsync(); - Assertions.assertArrayEquals(body, (byte[]) holder.value.getInvocationArguments().get("input")); - } - - @Test - public void testFail() { - Throwable error = new Error("failed"); - Response response = Response.createConsumerFail(error); - - CseAsyncClientHttpRequest client = - new CseAsyncClientHttpRequest(URI.create( - "cse://defaultMicroservice/" + CseAsyncClientHttpRequestTest.CseAsyncClientHttpRequestTestSchema.class - .getSimpleName() - + "/testbytes"), - HttpMethod.POST) { - @Override - protected CompletableFuture doAsyncInvoke(Invocation invocation) { - CompletableFuture completableFuture = new CompletableFuture<>(); - completableFuture.complete(new CseClientHttpResponse(response)); - return completableFuture; - } - }; - byte[] body = "abc".getBytes(); - client.setRequestBody(body); - ListenableFuture future = client.executeAsync(); - future.addCallback( - new ListenableFutureCallback() { - @Override - public void onFailure(Throwable ex) { - Assertions.assertSame(error, ex); - } - - @Override - public void onSuccess(ClientHttpResponse result) { - } - } - ); - } -} diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java deleted file mode 100644 index d65406569cd..00000000000 --- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRequestCallbackTest.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.provider.springmvc.reference.async; - -import org.apache.servicecomb.provider.springmvc.reference.CseHttpEntity; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; -import org.mockito.Mockito; -import org.springframework.http.HttpEntity; - -public class CseAsyncRequestCallbackTest { - @Test - public void testNormal() { - CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest(); - CseAsyncRequestCallback> cb = new CseAsyncRequestCallback<>(null); - cb.doWithRequest(request); - Assertions.assertNull(request.getContext()); - } - - @Test - public void testHttpEntity() { - HttpEntity entity = Mockito.mock(HttpEntity.class); - CseAsyncRequestCallback cb = new CseAsyncRequestCallback<>(entity); - CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest(); - cb.doWithRequest(request); - Assertions.assertEquals(entity.getBody(), request.getBody()); - } - - @Test - public void testCseEntity() { - CseHttpEntity entity = Mockito.mock(CseHttpEntity.class); - CseAsyncClientHttpRequest request = new CseAsyncClientHttpRequest(); - entity.addContext("c1", "c2"); - CseAsyncRequestCallback cb = new CseAsyncRequestCallback<>(entity); - cb.doWithRequest(request); - Assertions.assertEquals(entity.getContext(), request.getContext()); - } -} diff --git a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplateTest.java b/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplateTest.java deleted file mode 100644 index 8041b14d525..00000000000 --- a/providers/provider-springmvc/src/test/java/org/apache/servicecomb/provider/springmvc/reference/async/CseAsyncRestTemplateTest.java +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.servicecomb.provider.springmvc.reference.async; - -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Test; - -public class CseAsyncRestTemplateTest { - - @Test - public void testCseAsyncRestTemplate() { - Assertions.assertEquals(CseAsyncRestTemplate.class, new CseAsyncRestTemplate().getClass()); - } -} diff --git a/service-registry/pom.xml b/service-registry/pom.xml index eb3184c32da..52b8413d708 100644 --- a/service-registry/pom.xml +++ b/service-registry/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/service-registry/registry-lightweight/pom.xml b/service-registry/registry-lightweight/pom.xml index f98c22bbd3a..0a247e2e44b 100644 --- a/service-registry/registry-lightweight/pom.xml +++ b/service-registry/registry-lightweight/pom.xml @@ -22,7 +22,7 @@ service-registry-parent org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryClient.java b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryClient.java index 7c846882c6e..2ab7a37cae2 100644 --- a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryClient.java +++ b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryClient.java @@ -19,12 +19,12 @@ import java.util.concurrent.CompletableFuture; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.core.Endpoint; import org.apache.servicecomb.foundation.common.utils.AsyncUtils; diff --git a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryEndpoint.java b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryEndpoint.java index b3785b7758a..a53b2a27857 100644 --- a/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryEndpoint.java +++ b/service-registry/registry-lightweight/src/main/java/org/apache/servicecomb/registry/lightweight/DiscoveryEndpoint.java @@ -21,11 +21,11 @@ import java.util.concurrent.CompletableFuture; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.registry.api.registry.Microservice; diff --git a/service-registry/registry-local/pom.xml b/service-registry/registry-local/pom.xml index 43b48fc293d..f01313991bf 100644 --- a/service-registry/registry-local/pom.xml +++ b/service-registry/registry-local/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb service-registry-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/service-registry/registry-schema-discovery/pom.xml b/service-registry/registry-schema-discovery/pom.xml index 9dfba95a659..595fc5834b1 100644 --- a/service-registry/registry-schema-discovery/pom.xml +++ b/service-registry/registry-schema-discovery/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb service-registry-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java index b6a69dac145..e4f9e4ce5e6 100644 --- a/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java +++ b/service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryEndpoint.java @@ -17,11 +17,11 @@ package org.apache.servicecomb.schemadiscovery; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.provider.rest.common.RestSchema; import org.apache.servicecomb.registry.RegistrationManager; diff --git a/service-registry/registry-service-center/pom.xml b/service-registry/registry-service-center/pom.xml index a14321d7452..cc4eed3e722 100644 --- a/service-registry/registry-service-center/pom.xml +++ b/service-registry/registry-service-center/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb service-registry-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManager.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManager.java index e43f9127b7f..bf7c14d4fc3 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManager.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/TokenCacheManager.java @@ -24,7 +24,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.foundation.auth.Cipher; diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java index 28311a0ebeb..85d502b9283 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/client/http/ServiceRegistryClientImpl.java @@ -30,7 +30,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.foundation.common.net.IpPort; import org.apache.servicecomb.foundation.common.utils.JsonUtils; diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceRegisterTask.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceRegisterTask.java index 0e98fb3b5a1..a10bcb1e0ec 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceRegisterTask.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceInstanceRegisterTask.java @@ -30,6 +30,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.common.annotations.VisibleForTesting; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; @@ -113,4 +114,9 @@ public void run() { srClient.checkIsolationAddressAvailable(); } } + + @VisibleForTesting + void setAddrCheckInit(boolean addrCheckInit) { + isAddrCheckInit = addrCheckInit; + } } diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java index cb6d15d61fa..a38f7505791 100644 --- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java +++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/task/MicroserviceRegisterTask.java @@ -23,7 +23,7 @@ import java.util.Map.Entry; import java.util.Set; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.config.BootStrapProperties; diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java index 47a2371dd3c..cca27e0ef0c 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/LocalServiceRegistryClientImpl.java @@ -27,7 +27,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.atomic.AtomicInteger; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.config.BootStrapProperties; diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java index 77f69c9084f..dbe9b59df1e 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/client/http/TestServiceRegistryClientImpl.java @@ -26,7 +26,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.log4j.Appender; import org.apache.log4j.Logger; diff --git a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java index e7f1963b09f..ae0766e25bf 100644 --- a/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java +++ b/service-registry/registry-service-center/src/test/java/org/apache/servicecomb/serviceregistry/task/TestMicroserviceInstanceRegisterTask.java @@ -89,6 +89,7 @@ public void microserviceNotRegistered() { MicroserviceInstanceRegisterTask registerTask = new MicroserviceInstanceRegisterTask(eventBus, serviceRegistryConfig, null, microservice); + registerTask.setAddrCheckInit(true); registerTask.run(); Assertions.assertFalse(registerTask.isRegistered()); @@ -119,6 +120,7 @@ public void registerIpSuccess() { MicroserviceInstanceRegisterTask registerTask = new MicroserviceInstanceRegisterTask(eventBus, serviceRegistryConfig, srClient, microservice); registerTask.taskStatus = TaskStatus.READY; + registerTask.setAddrCheckInit(true); registerTask.run(); Assertions.assertTrue(registerTask.isRegistered()); @@ -153,6 +155,7 @@ public void registerHostSuccess() { MicroserviceInstanceRegisterTask registerTask = new MicroserviceInstanceRegisterTask(eventBus, serviceRegistryConfig, srClient, microservice); registerTask.taskStatus = TaskStatus.READY; + registerTask.setAddrCheckInit(true); registerTask.run(); Assertions.assertTrue(registerTask.isRegistered()); @@ -187,6 +190,7 @@ public void registerIpFailed() { MicroserviceInstanceRegisterTask registerTask = new MicroserviceInstanceRegisterTask(eventBus, serviceRegistryConfig, srClient, microservice); registerTask.taskStatus = TaskStatus.READY; + registerTask.setAddrCheckInit(true); registerTask.run(); Assertions.assertFalse(registerTask.isRegistered()); diff --git a/service-registry/registry-zero-config/pom.xml b/service-registry/registry-zero-config/pom.xml index 05217fe1ad0..14e6141bdff 100644 --- a/service-registry/registry-zero-config/pom.xml +++ b/service-registry/registry-zero-config/pom.xml @@ -22,7 +22,7 @@ service-registry-parent org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/solutions/pom.xml b/solutions/pom.xml index b1d307628ff..fecd79e6d57 100644 --- a/solutions/pom.xml +++ b/solutions/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 diff --git a/solutions/solution-basic/pom.xml b/solutions/solution-basic/pom.xml index 14b177bbb85..874dfd69563 100644 --- a/solutions/solution-basic/pom.xml +++ b/solutions/solution-basic/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb solutions - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml index ab9987dda68..ed01081bf6c 100644 --- a/spring-boot/pom.xml +++ b/spring-boot/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml index f8d8674ea9e..1e5fef592bd 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/pom.xml @@ -22,7 +22,7 @@ java-chassis-spring-boot-starters org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java index bba62e0ec06..fe8220ef5ac 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-servlet/src/main/java/org/apache/servicecomb/springboot2/starter/servlet/RestServletInitializer.java @@ -20,8 +20,8 @@ import java.io.IOException; import java.net.ServerSocket; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; import org.apache.commons.configuration.Configuration; import org.apache.commons.lang3.StringUtils; diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml index 391fbac09c0..897254768b0 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter-standalone/pom.xml @@ -22,7 +22,7 @@ java-chassis-spring-boot-starters org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml index 0fdcdcebe84..82d0df5db8a 100644 --- a/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml +++ b/spring-boot/spring-boot-starters/java-chassis-spring-boot-starter/pom.xml @@ -22,7 +22,7 @@ java-chassis-spring-boot-starters org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/spring-boot/spring-boot-starters/pom.xml b/spring-boot/spring-boot-starters/pom.xml index 08129fcfc19..b317797e557 100644 --- a/spring-boot/spring-boot-starters/pom.xml +++ b/spring-boot/spring-boot-starters/pom.xml @@ -22,7 +22,7 @@ java-chassis-spring-boot org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/swagger/pom.xml b/swagger/pom.xml index ec5274442e9..b2ad90445c3 100644 --- a/swagger/pom.xml +++ b/swagger/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default swagger diff --git a/swagger/swagger-generator/generator-core/pom.xml b/swagger/swagger-generator/generator-core/pom.xml index 688db64c587..c0aa020363a 100644 --- a/swagger/swagger-generator/generator-core/pom.xml +++ b/swagger/swagger-generator/generator-core/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger-generator - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-generator-core Java Chassis::Swagger::Generator::Core @@ -44,20 +44,14 @@ jakarta.servlet-api - com.google.inject - guice + jakarta.xml.bind + jakarta.xml.bind-api - - javax.xml.bind - jaxb-api + com.google.inject + guice - - org.mockito - mockito-inline - test - org.junit.jupiter junit-jupiter-api diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java index 2444c591c40..a6cd91786c5 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java @@ -32,9 +32,9 @@ import java.util.Map.Entry; import java.util.stream.Collectors; -import javax.servlet.http.Part; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status.Family; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.ClassUtils; @@ -45,13 +45,13 @@ import org.apache.servicecomb.foundation.common.utils.ReflectUtils; import org.apache.servicecomb.swagger.extend.PropertyModelConverterExt; import org.apache.servicecomb.swagger.generator.SwaggerConst; +import org.apache.servicecomb.swagger.jakarta.ModelConvertersAdapterJakarta; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.type.TypeFactory; -import io.swagger.converter.ModelConverters; import io.swagger.models.Info; import io.swagger.models.Model; import io.swagger.models.ModelImpl; @@ -211,7 +211,7 @@ public static void addDefinitions(Swagger swagger, Type paramType) { if (javaType.isTypeOrSubTypeOf(DynamicEnum.class)) { return; } - Map models = ModelConverters.getInstance().readAll(javaType); + Map models = ModelConvertersAdapterJakarta.getInstance().readAll(javaType); for (Entry entry : models.entrySet()) { if (!modelNotDuplicate(swagger, entry)) { LOGGER.warn("duplicate param model: " + entry.getKey()); @@ -246,7 +246,7 @@ private static boolean modelOfClassNotDuplicate(Model tempModel, Model model) { public static void setParameterType(Swagger swagger, JavaType type, AbstractSerializableParameter parameter) { addDefinitions(swagger, type); - Property property = ModelConverters.getInstance().readAsProperty(type); + Property property = ModelConvertersAdapterJakarta.getInstance().readAsProperty(type); if (isComplexProperty(property)) { // cannot set a simple parameter(header, query, etc.) as complex type diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/ConverterMgr.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/ConverterMgr.java index e0900daeba3..b0d1e8d82e3 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/ConverterMgr.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/converter/ConverterMgr.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.swagger.converter.model.ArrayModelConverter; import org.apache.servicecomb.swagger.converter.model.ModelImplConverter; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java index e1bcac77240..e0b148e5f24 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/ModelResolverExt.java @@ -40,6 +40,7 @@ import org.apache.servicecomb.swagger.extend.property.creator.PropertyCreator; import org.apache.servicecomb.swagger.extend.property.creator.ShortPropertyCreator; import org.apache.servicecomb.swagger.generator.SwaggerConst; +import org.apache.servicecomb.swagger.jakarta.ModelResolverAdapterJakarta; import com.fasterxml.jackson.databind.JavaType; import com.fasterxml.jackson.databind.ObjectMapper; @@ -48,7 +49,6 @@ import io.swagger.converter.ModelConverter; import io.swagger.converter.ModelConverterContext; -import io.swagger.jackson.ModelResolver; import io.swagger.models.Model; import io.swagger.models.ModelImpl; import io.swagger.models.properties.IntegerProperty; @@ -56,7 +56,7 @@ import io.swagger.models.properties.StringProperty; import io.swagger.util.PrimitiveType; -public class ModelResolverExt extends ModelResolver { +public class ModelResolverExt extends ModelResolverAdapterJakarta { private final Map, PropertyCreator> propertyCreatorMap = new HashMap<>(); private static ObjectMapper objectMapper; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java index 85dd938fd9a..fbf87c3efdd 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/introspector/JsonPropertyIntrospector.java @@ -20,13 +20,12 @@ import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.foundation.common.base.EnumUtils; import org.apache.servicecomb.swagger.extend.SwaggerEnum; +import org.apache.servicecomb.swagger.jakarta.SwaggerAnnotationIntrospectorAdapterJakarta; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.databind.introspect.Annotated; -import io.swagger.jackson.SwaggerAnnotationIntrospector; - -public class JsonPropertyIntrospector extends SwaggerAnnotationIntrospector { +public class JsonPropertyIntrospector extends SwaggerAnnotationIntrospectorAdapterJakarta { private static final long serialVersionUID = 4157263023893695762L; @SuppressWarnings("deprecation") diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java index 4196ec2a9ad..9b858fbd47e 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/extend/property/creator/PartPropertyCreator.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.swagger.extend.property.creator; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import io.swagger.models.properties.FileProperty; import io.swagger.models.properties.Property; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerConst.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerConst.java index b9d7b0011fd..7c5b36de5dd 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerConst.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/SwaggerConst.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.swagger.generator; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; public final class SwaggerConst { private SwaggerConst() { diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java index b31c91154e3..5508ce00cb9 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractOperationGenerator.java @@ -39,8 +39,8 @@ import java.util.Set; import java.util.stream.Collectors; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.config.inject.PlaceholderResolver; @@ -53,6 +53,8 @@ import org.apache.servicecomb.swagger.generator.SwaggerConst; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; import org.apache.servicecomb.swagger.generator.core.utils.MethodUtils; +import org.apache.servicecomb.swagger.jakarta.ModelConvertersAdapterJakarta; +import org.apache.servicecomb.swagger.jakarta.ParameterProcessorAdapterJakarta; import com.fasterxml.jackson.databind.BeanDescription; import com.fasterxml.jackson.databind.JavaType; @@ -63,7 +65,6 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiParam; -import io.swagger.converter.ModelConverters; import io.swagger.models.HttpMethod; import io.swagger.models.Model; import io.swagger.models.ModelImpl; @@ -406,7 +407,7 @@ protected void fillParameter(Swagger swagger, Parameter parameter, String parame } if (parameter instanceof AbstractSerializableParameter) { - io.swagger.util.ParameterProcessor.applyAnnotations(swagger, parameter, type, annotations); + ParameterProcessorAdapterJakarta.applyAnnotations(swagger, parameter, type, annotations); annotations.stream().forEach(annotation -> { if (NOT_NULL_ANNOTATIONS.contains(annotation.annotationType().getSimpleName())) { parameter.setRequired(true); @@ -422,13 +423,13 @@ protected void fillBodyParameter(Swagger swagger, Parameter parameter, Type type // so strange, for bodyParameter, swagger return a new instance // that will cause lost some information // so we must merge them - BodyParameter newBodyParameter = (BodyParameter) io.swagger.util.ParameterProcessor.applyAnnotations( + BodyParameter newBodyParameter = (BodyParameter) ParameterProcessorAdapterJakarta.applyAnnotations( swagger, parameter, type, annotations); // swagger missed enum data, fix it ModelImpl model = SwaggerUtils.getModelImpl(swagger, newBodyParameter); if (model != null) { - Property property = ModelConverters.getInstance().readAsProperty(type); + Property property = ModelConvertersAdapterJakarta.getInstance().readAsProperty(type); if (property instanceof StringProperty) { model.setEnum(((StringProperty) property).getEnum()); } diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java index 288f57c6f66..8c08f04cc35 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/AbstractSwaggerGenerator.java @@ -31,7 +31,7 @@ import java.util.Map; import java.util.Set; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.config.inject.PlaceholderResolver; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java index e4cea34f407..f4280b152ce 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/AnnotationUtils.java @@ -28,12 +28,12 @@ import org.apache.servicecomb.swagger.generator.core.processor.annotation.models.ResponseConfig; import org.apache.servicecomb.swagger.generator.core.processor.annotation.models.ResponseConfigBase; import org.apache.servicecomb.swagger.generator.core.processor.annotation.models.ResponseHeaderConfig; +import org.apache.servicecomb.swagger.jakarta.ModelConvertersAdapterJakarta; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiResponse; import io.swagger.annotations.ExampleProperty; import io.swagger.annotations.ResponseHeader; -import io.swagger.converter.ModelConverters; import io.swagger.models.Model; import io.swagger.models.Operation; import io.swagger.models.Response; @@ -202,11 +202,11 @@ public static Property generateResponseProperty(Swagger swagger, ResponseConfigB } if (!ClassUtils.isPrimitiveOrWrapper(responseClass)) { - Map newDefinitions = ModelConverters.getInstance().readAll(responseClass); + Map newDefinitions = ModelConvertersAdapterJakarta.getInstance().readAll(responseClass); appendDefinition(swagger, newDefinitions); } - Property property = ModelConverters.getInstance().readAsProperty(responseClass); + Property property = ModelConvertersAdapterJakarta.getInstance().readAsProperty(responseClass); // responseContainer只可能是:"List", "Set" or "Map" // 根据swagger定义这里是区分大小写的， 虽然不明白为何这样做，不过还是不要改标准了 switch (config.getResponseContainer()) { diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessor.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessor.java index fa753934999..c091e1248d9 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessor.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessor.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.swagger.SwaggerUtils; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/EnumPostProcessor.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/EnumPostProcessor.java index 9402ea049e3..de3e15e7826 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/EnumPostProcessor.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/EnumPostProcessor.java @@ -22,7 +22,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.foundation.common.base.DynamicEnum; import org.apache.servicecomb.swagger.extend.SwaggerEnum; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/HttpServletRequestContextRegister.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/HttpServletRequestContextRegister.java index 13485682f58..8e9f7199685 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/HttpServletRequestContextRegister.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/HttpServletRequestContextRegister.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.swagger.generator.SwaggerContextRegister; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartArrayProcessor.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartArrayProcessor.java index 415628746b0..83ede97f25e 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartArrayProcessor.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartArrayProcessor.java @@ -19,7 +19,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.swagger.generator.ParameterProcessor; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartListProcessor.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartListProcessor.java index 582f6b9aa62..e736944ef51 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartListProcessor.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartListProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; import java.util.List; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import com.google.inject.util.Types; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartProcessor.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartProcessor.java index b09c11c34d5..784025a50d9 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartProcessor.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/parameter/PartProcessor.java @@ -19,7 +19,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.swagger.generator.ParameterProcessor; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java index 37ddad5fa60..d14789d17fe 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/processor/response/DefaultResponseTypeProcessor.java @@ -21,15 +21,15 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.swagger.SwaggerUtils; import org.apache.servicecomb.swagger.extend.PropertyModelConverterExt; import org.apache.servicecomb.swagger.generator.OperationGenerator; import org.apache.servicecomb.swagger.generator.ResponseTypeProcessor; import org.apache.servicecomb.swagger.generator.SwaggerGenerator; +import org.apache.servicecomb.swagger.jakarta.ModelConvertersAdapterJakarta; -import io.swagger.converter.ModelConverters; import io.swagger.models.Model; import io.swagger.models.properties.Property; import io.swagger.util.ReflectionUtils; @@ -87,7 +87,7 @@ public Model process(SwaggerGenerator swaggerGenerator, OperationGenerator opera responseType = Part.class; } SwaggerUtils.addDefinitions(swaggerGenerator.getSwagger(), responseType); - Property property = ModelConverters.getInstance().readAsProperty(responseType); + Property property = ModelConvertersAdapterJakarta.getInstance().readAsProperty(responseType); return PropertyModelConverterExt.toModel(property); } } diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java index acca28c7fb9..730f2693339 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoOperationGenerator.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.stream.Collectors; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.swagger.SwaggerUtils; @@ -33,10 +33,10 @@ import org.apache.servicecomb.swagger.generator.core.AbstractSwaggerGenerator; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; import org.apache.servicecomb.swagger.generator.core.utils.MethodUtils; +import org.apache.servicecomb.swagger.jakarta.ModelConvertersAdapterJakarta; import com.fasterxml.jackson.databind.JavaType; -import io.swagger.converter.ModelConverters; import io.swagger.models.ModelImpl; import io.swagger.models.RefModel; import io.swagger.models.Swagger; @@ -90,7 +90,7 @@ private void wrapParametersToBody(List bodyFields) { parameterGenerator.setHttpParameterType(HttpParameterType.BODY); scanMethodParameter(parameterGenerator); - Property property = ModelConverters.getInstance().readAsProperty(parameterGenerator.getGenericType()); + Property property = ModelConvertersAdapterJakarta.getInstance().readAsProperty(parameterGenerator.getGenericType()); property.setDescription(parameterGenerator.getGeneratedParameter().getDescription()); bodyModel.addProperty(parameterGenerator.getParameterName(), property); diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoSwaggerGeneratorFactory.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoSwaggerGeneratorFactory.java index 0a19efa558e..05053f8609d 100644 --- a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoSwaggerGeneratorFactory.java +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/pojo/PojoSwaggerGeneratorFactory.java @@ -18,7 +18,7 @@ import java.lang.annotation.Annotation; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.generator.SwaggerGenerator; import org.apache.servicecomb.swagger.generator.SwaggerGeneratorFactory; diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/AbstractModelConverterAdapterJakarta.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/AbstractModelConverterAdapterJakarta.java new file mode 100644 index 00000000000..7a9d2fbbb43 --- /dev/null +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/AbstractModelConverterAdapterJakarta.java @@ -0,0 +1,248 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.servicecomb.swagger.jakarta; + +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyName; +import com.fasterxml.jackson.databind.introspect.Annotated; +import com.fasterxml.jackson.databind.jsontype.NamedType; +import com.fasterxml.jackson.databind.module.SimpleModule; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.converter.ModelConverter; +import io.swagger.converter.ModelConverterContext; +import io.swagger.jackson.TypeNameResolver; +import io.swagger.models.Model; +import io.swagger.models.properties.Property; +import org.apache.commons.lang3.StringUtils; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.util.Comparator; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; + +import jakarta.xml.bind.annotation.XmlElement; + +/** + * replace io.swagger.jackson.AbstractModelConverter to adapter JAVAEE9 jakarta API + * modifying content: mapper register model change to SwaggerAnnotationIntrospectorAdapterJakarta to adapter jakarta. + */ +public abstract class AbstractModelConverterAdapterJakarta implements ModelConverter { + protected final ObjectMapper _mapper; + protected final AnnotationIntrospector _intr; + protected final TypeNameResolver _typeNameResolver; + /** + * Minor optimization: no need to keep on resolving same types over and over + * again. + */ + protected Map _resolvedTypeNames = new ConcurrentHashMap(); + + protected AbstractModelConverterAdapterJakarta(ObjectMapper mapper) { + this(mapper, TypeNameResolver.std); + } + + protected AbstractModelConverterAdapterJakarta(ObjectMapper mapper, TypeNameResolver typeNameResolver) { + mapper.registerModule( + new SimpleModule("swagger", Version.unknownVersion()) { + @Override + public void setupModule(SetupContext context) { + context.insertAnnotationIntrospector(new SwaggerAnnotationIntrospectorAdapterJakarta()); + } + }); + _mapper = mapper; + _typeNameResolver = typeNameResolver; + _intr = mapper.getSerializationConfig().getAnnotationIntrospector(); + + } + + protected static Comparator getPropertyComparator() { + return new Comparator() { + @Override + public int compare(Property one, Property two) { + if (one.getPosition() == null && two.getPosition() == null) { + return 0; + } + if (one.getPosition() == null) { + return -1; + } + if (two.getPosition() == null) { + return 1; + } + return one.getPosition().compareTo(two.getPosition()); + } + }; + } + + @Override + public Property resolveProperty(Type type, + ModelConverterContext context, + Annotation[] annotations, + Iterator chain) { + if (chain.hasNext()) { + return chain.next().resolveProperty(type, context, annotations, chain); + } else { + return null; + } + } + + protected String _description(Annotated ann) { + // while name suggests it's only for properties, should work for any Annotated thing. + // also; with Swagger introspector's help, should get it from ApiModel/ApiModelProperty + return _intr.findPropertyDescription(ann); + } + + protected String _typeName(JavaType type) { + return _typeName(type, null); + } + + protected String _typeName(JavaType type, BeanDescription beanDesc) { + String name = _resolvedTypeNames.get(type); + if (name != null) { + return name; + } + name = _findTypeName(type, beanDesc); + _resolvedTypeNames.put(type, name); + return name; + } + + /** + * whether to resolve schema name by first using AnnotationInspector registered implementations + * defaults to false, override returning `true` to obtain pre-1.5.24 behaviour + * + * @return false + * @since 1.5.24 + */ + protected boolean prioritizeAnnotationInspectorSchemaName() { + return false; + } + protected String _findTypeName(JavaType type, BeanDescription beanDesc) { + // First, handle container types; they require recursion + if (type.isArrayType()) { + return "Array"; + } + + if (type.isMapLikeType()) { + return "Map"; + } + + if (type.isContainerType()) { + if (Set.class.isAssignableFrom(type.getRawClass())) { + return "Set"; + } + return "List"; + } + if (beanDesc == null) { + beanDesc = _mapper.getSerializationConfig().introspectClassAnnotations(type); + } + + if (!prioritizeAnnotationInspectorSchemaName()) { + final ApiModel model = type.getRawClass().getAnnotation(ApiModel.class); + if (model != null && StringUtils.isNotBlank(model.value())) { + return _typeNameResolver.nameForType(type); + } + } + PropertyName rootName = _intr.findRootName(beanDesc.getClassInfo()); + if (rootName != null && rootName.hasSimpleName()) { + return rootName.getSimpleName(); + } + return _typeNameResolver.nameForType(type); + } + + protected String _typeQName(JavaType type) { + return type.getRawClass().getName(); + } + + protected String _subTypeName(NamedType type) { + // !!! TODO: should this use 'name' instead? + return type.getType().getName(); + } + + protected String _findDefaultValue(Annotated a) { + XmlElement elem = a.getAnnotation(XmlElement.class); + if (elem != null) { + if (!elem.defaultValue().isEmpty() && !"\u0000".equals(elem.defaultValue())) { + return elem.defaultValue(); + } + } + return null; + } + + protected String _findExampleValue(Annotated a) { + ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class); + if (prop != null) { + if (!prop.example().isEmpty()) { + return prop.example(); + } + } + return null; + } + + protected Boolean _findReadOnly(Annotated a) { + ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class); + if (prop != null) { + return prop.readOnly(); + } + return null; + } + + protected Boolean _findReadOnlyFromAccessMode(Annotated a) { + ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class); + if (prop != null) { + if (prop.accessMode().equals(ApiModelProperty.AccessMode.AUTO)) { + return null; + } else if (prop.accessMode().equals(ApiModelProperty.AccessMode.READ_ONLY)) { + return true; + } + return false; + } + return null; + } + + protected boolean _isSetType(Class cls) { + if (cls != null) { + + if (java.util.Set.class.equals(cls)) { + return true; + } else { + for (Class a : cls.getInterfaces()) { + // this is dirty and ugly and needs to be extended into a scala model converter. But to avoid bringing in scala runtime... + if (java.util.Set.class.equals(a) || "interface scala.collection.Set".equals(a.toString())) { + return true; + } + } + } + } + return false; + } + + @Override + public Model resolve(Type type, ModelConverterContext context, Iterator chain) { + if (chain.hasNext()) { + return chain.next().resolve(type, context, chain); + } else { + return null; + } + } +} diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/JAXBAnnotationsHelperAdapterJakarta.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/JAXBAnnotationsHelperAdapterJakarta.java new file mode 100644 index 00000000000..b8475fac9be --- /dev/null +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/JAXBAnnotationsHelperAdapterJakarta.java @@ -0,0 +1,159 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.servicecomb.swagger.jakarta; + +import org.apache.commons.lang3.StringUtils; + +import com.fasterxml.jackson.databind.introspect.AnnotatedMember; + +import io.swagger.models.Xml; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.ObjectProperty; +import io.swagger.models.properties.Property; +import io.swagger.models.properties.RefProperty; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementWrapper; + +/** + * replace io.swagger.jackson.JAXBAnnotationsHelper to adapter JAVAEE9 jakarta API + * modifying content: javax API dependency changing to the jakarta API dependency. + */ +public class JAXBAnnotationsHelperAdapterJakarta { + private static final String JAXB_DEFAULT = "##default"; + + private JAXBAnnotationsHelperAdapterJakarta() { + } + + /** + * Applies annotations to property's {@link Xml} definition. + * + * @param member annotations provider + * @param property property instance to be updated + */ + public static void apply(AnnotatedMember member, Property property) { + if (member.hasAnnotation(XmlElementWrapper.class) || member.hasAnnotation(XmlElement.class)) { + applyElement(member, property); + } else if (member.hasAnnotation(XmlAttribute.class) && isAttributeAllowed(property)) { + applyAttribute(member, property); + } + } + + /** + * Puts definitions for XML element. + * + * @param member annotations provider + * @param property property instance to be updated + */ + private static void applyElement(AnnotatedMember member, Property property) { + final XmlElementWrapper wrapper = member.getAnnotation(XmlElementWrapper.class); + if (wrapper != null) { + final Xml xml = getXml(property); + xml.setWrapped(true); + // No need to set the xml name if the name provided by xmlelementwrapper annotation is ##default or equal to the property name | https://github.com/swagger-api/swagger-core/pull/2050 + if (!"##default".equals(wrapper.name()) && !wrapper.name().isEmpty() && !wrapper.name().equals(property.getName())) { + xml.setName(wrapper.name()); + } + } else { + final XmlElement element = member.getAnnotation(XmlElement.class); + if (element != null) { + setName(element.namespace(), element.name(), property); + } + } + } + + /** + * Puts definitions for XML attribute. + * + * @param member annotations provider + * @param property property instance to be updated + */ + private static void applyAttribute(AnnotatedMember member, Property property) { + final XmlAttribute attribute = member.getAnnotation(XmlAttribute.class); + if (attribute != null) { + final Xml xml = getXml(property); + xml.setAttribute(true); + setName(attribute.namespace(), attribute.name(), property); + } + } + + private static Xml getXml(Property property) { + final Xml existing = property.getXml(); + if (existing != null) { + return existing; + } + final Xml created = new Xml(); + property.setXml(created); + return created; + } + + /** + * Puts name space and name for XML node or attribute. + * + * @param ns name space + * @param name name + * @param property property instance to be updated + * @return true if name space and name have been set + */ + private static boolean setName(String ns, String name, Property property) { + boolean apply = false; + final String cleanName = StringUtils.trimToNull(name); + final String useName; + if (!isEmpty(cleanName) && !cleanName.equals(property.getName())) { + useName = cleanName; + apply = true; + } else { + useName = null; + } + final String cleanNS = StringUtils.trimToNull(ns); + final String useNS; + if (!isEmpty(cleanNS)) { + useNS = cleanNS; + apply = true; + } else { + useNS = null; + } + // Set everything or nothing + if (apply) { + getXml(property).name(useName).namespace(useNS); + } + return apply; + } + + /** + * Checks whether the passed property can be represented as node attribute. + * + * @param property property instance to be checked + * @return true if the passed property can be represented as + * node attribute + */ + private static boolean isAttributeAllowed(Property property) { + for (Class item : new Class[]{ArrayProperty.class, MapProperty.class, ObjectProperty.class, + RefProperty.class}) { + if (item.isInstance(property)) { + return false; + } + } + return true; + } + + private static boolean isEmpty(String name) { + return StringUtils.isEmpty(name) || JAXB_DEFAULT.equals(name); + } +} diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelConvertersAdapterJakarta.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelConvertersAdapterJakarta.java new file mode 100644 index 00000000000..80af9796a68 --- /dev/null +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelConvertersAdapterJakarta.java @@ -0,0 +1,161 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.servicecomb.swagger.jakarta; + +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.databind.type.TypeFactory; + +import io.swagger.converter.ModelConverter; +import io.swagger.converter.ModelConverterContextImpl; +import io.swagger.models.Model; +import io.swagger.models.properties.Property; +import io.swagger.util.Json; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.ServiceLoader; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; + +/** + * replace io.swagger.converter.ModelConverters to adapter JAVAEE9 jakarta API + * modifying content: converters add ModelResolverAdapterJakarta to adapter jakarta. + */ +public class ModelConvertersAdapterJakarta { + private static final ModelConvertersAdapterJakarta SINGLETON = new ModelConvertersAdapterJakarta(); + static Logger LOGGER = LoggerFactory.getLogger(io.swagger.converter.ModelConverters.class); + private final List converters; + private final Set skippedPackages = new HashSet(); + private final Set skippedClasses = new HashSet(); + + public ModelConvertersAdapterJakarta() { + converters = new CopyOnWriteArrayList(); + converters.add(new ModelResolverAdapterJakarta(Json.mapper())); + } + + public static ModelConvertersAdapterJakarta getInstance() { + return SINGLETON; + } + + public void addConverter(ModelConverter converter) { + converters.add(0, converter); + } + + public void removeConverter(ModelConverter converter) { + converters.remove(converter); + } + + public void addPackageToSkip(String pkg) { + this.skippedPackages.add(pkg); + } + + public void addClassToSkip(String cls) { + LOGGER.warn("skipping class " + cls); + this.skippedClasses.add(cls); + } + + public Property readAsProperty(Type type) { + return readAsProperty(type, null); + } + + public Property readAsProperty(Type type, JsonView jsonView) { + ModelConverterContextImpl context = new ModelConverterContextImpl(converters); + context.setJsonView(jsonView); + return context.resolveProperty(type, null); + } + + public Map read(Type type) { + return read(type, null); + } + + public Map read(Type type, JsonView jsonView) { + Map modelMap = new HashMap(); + if (shouldProcess(type)) { + ModelConverterContextImpl context = new ModelConverterContextImpl( + converters); + context.setJsonView(jsonView); + Model resolve = context.resolve(type); + for (Entry entry : context.getDefinedModels() + .entrySet()) { + if (entry.getValue().equals(resolve)) { + modelMap.put(entry.getKey(), entry.getValue()); + } + } + } + return modelMap; + } + + public Map readAll(Type type) { + return readAll(type, null); + } + + public Map readAll(Type type, JsonView annotation) { + if (shouldProcess(type)) { + ModelConverterContextImpl context = new ModelConverterContextImpl( + converters); + context.setJsonView(annotation); + + LOGGER.debug("ModelConvertersAdapterJakarta readAll with JsonView annotation from " + type); + context.resolve(type); + return context.getDefinedModels(); + } + return new HashMap(); + } + + private boolean shouldProcess(Type type) { + final Class cls = TypeFactory.defaultInstance().constructType(type).getRawClass(); + if (cls.isPrimitive()) { + return false; + } + String className = cls.getName(); + for (String packageName : skippedPackages) { + if (className.startsWith(packageName)) { + return false; + } + } + for (String classToSkip : skippedClasses) { + if (className.equals(classToSkip)) { + return false; + } + } + return true; + } + + static { + SINGLETON.skippedPackages.add("java.lang"); + + ServiceLoader loader = ServiceLoader.load(ModelConverter.class); + Iterator itr = loader.iterator(); + while (itr.hasNext()) { + ModelConverter ext = itr.next(); + if (ext == null) { + LOGGER.error("failed to load extension " + ext); + } else { + SINGLETON.addConverter(ext); + LOGGER.debug("adding ModelConverter: " + ext); + } + } + } +} diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelResolverAdapterJakarta.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelResolverAdapterJakarta.java new file mode 100644 index 00000000000..a68177dd426 --- /dev/null +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ModelResolverAdapterJakarta.java @@ -0,0 +1,1091 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.servicecomb.swagger.jakarta; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.ListIterator; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; +import jakarta.xml.bind.annotation.XmlAccessType; +import jakarta.xml.bind.annotation.XmlAccessorType; +import jakarta.xml.bind.annotation.XmlAttribute; +import jakarta.xml.bind.annotation.XmlElement; +import jakarta.xml.bind.annotation.XmlElementRef; +import jakarta.xml.bind.annotation.XmlElementRefs; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlSchema; + +import com.fasterxml.jackson.annotation.JsonIdentityInfo; +import com.fasterxml.jackson.annotation.JsonIdentityReference; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonUnwrapped; +import com.fasterxml.jackson.annotation.JsonValue; +import com.fasterxml.jackson.annotation.JsonView; +import com.fasterxml.jackson.annotation.ObjectIdGenerator; +import com.fasterxml.jackson.annotation.ObjectIdGenerators; +import com.fasterxml.jackson.databind.BeanDescription; +import com.fasterxml.jackson.databind.JavaType; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyMetadata; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.introspect.Annotated; +import com.fasterxml.jackson.databind.introspect.AnnotatedMember; +import com.fasterxml.jackson.databind.introspect.BeanPropertyDefinition; +import com.fasterxml.jackson.databind.jsontype.NamedType; +import com.fasterxml.jackson.databind.type.TypeFactory; +import com.google.common.collect.Iterables; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.converter.ModelConverter; +import io.swagger.converter.ModelConverterContext; +import io.swagger.jackson.TypeNameResolver; +import io.swagger.models.ComposedModel; +import io.swagger.models.Model; +import io.swagger.models.ModelImpl; +import io.swagger.models.RefModel; +import io.swagger.models.Xml; +import io.swagger.models.properties.AbstractNumericProperty; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.IntegerProperty; +import io.swagger.models.properties.MapProperty; +import io.swagger.models.properties.Property; +import io.swagger.models.properties.PropertyBuilder; +import io.swagger.models.properties.RefProperty; +import io.swagger.models.properties.StringProperty; +import io.swagger.models.properties.UUIDProperty; +import io.swagger.models.refs.RefFormat; +import io.swagger.util.AllowableValues; +import io.swagger.util.AllowableValuesUtils; +import io.swagger.util.BaseReaderUtils; +import io.swagger.util.PrimitiveType; +import io.swagger.util.ReflectionUtils; + +/** + * replace io.swagger.jackson.ModelResolver to adapter JAVAEE9 jakarta API + * modifying content: javax API dependency changing to the jakarta API dependency. + */ +public class ModelResolverAdapterJakarta extends AbstractModelConverterAdapterJakarta implements ModelConverter { + Logger LOGGER = LoggerFactory.getLogger(io.swagger.jackson.ModelResolver.class); + + public ModelResolverAdapterJakarta(ObjectMapper mapper) { + super(mapper); + } + public ModelResolverAdapterJakarta(ObjectMapper mapper, TypeNameResolver typeNameResolver) { + super(mapper, typeNameResolver); + } + + public ObjectMapper objectMapper() { + return _mapper; + } + + protected boolean shouldIgnoreClass(Type type) { + if (type instanceof Class) { + Class cls = (Class) type; + if (cls.getName().equals("jakarta.ws.rs.core.Response")) { + return true; + } + } else { + if (type instanceof com.fasterxml.jackson.core.type.ResolvedType) { + com.fasterxml.jackson.core.type.ResolvedType rt = (com.fasterxml.jackson.core.type.ResolvedType) type; + LOGGER.debug("Can't check class {}, {}", type, rt.getRawClass().getName()); + if (rt.getRawClass().equals(Class.class)) { + return true; + } + } + } + return false; + } + + @Override + public Property resolveProperty(Type type, + ModelConverterContext context, + Annotation[] annotations, + Iterator next) { + if (this.shouldIgnoreClass(type)) { + return null; + } + + return resolveProperty(_mapper.constructType(type), context, annotations, next); + } + + public Property resolveProperty(JavaType propType, + ModelConverterContext context, + Annotation[] annotations, + Iterator next) { + LOGGER.debug("resolveProperty {}", propType); + + Property property = null; + if (propType.isContainerType()) { + JavaType keyType = propType.getKeyType(); + JavaType valueType = propType.getContentType(); + if (keyType != null && valueType != null) { + property = new MapProperty().additionalProperties(context.resolveProperty(valueType, new Annotation[]{})); + } else if (valueType != null) { + Property items = context.resolveProperty(valueType, new Annotation[]{}); + + // If property is XmlElement annotated, then use the name provided by annotation | https://github.com/swagger-api/swagger-core/issues/2047 + if (annotations != null && annotations.length > 0) { + for (Annotation annotation : annotations) { + if (annotation instanceof XmlElement) { + XmlElement xmlElement = (XmlElement) annotation; + if (xmlElement != null && xmlElement.name() != null && !"".equals(xmlElement.name()) && !"##default".equals(xmlElement.name())) { + Xml xml = items.getXml() != null ? items.getXml() : new Xml(); + xml.setName(xmlElement.name()); + items.setXml(xml); + } + } + } + } + ArrayProperty arrayProperty = + new ArrayProperty().items(items); + if (_isSetType(propType.getRawClass())) { + arrayProperty.setUniqueItems(true); + } + property = arrayProperty; + } + } else { + property = PrimitiveType.createProperty(propType); + } + + if (property == null) { + if (propType.isEnumType()) { + property = new StringProperty(); + _addEnumProps(propType.getRawClass(), (StringProperty) property); + } else if (_isReferenceType(propType)) { + property = context.resolveProperty(propType.containedType(0), null); + } else { + // complex type + Model innerModel = context.resolve(propType); + if (innerModel instanceof ComposedModel) { + innerModel = ((ComposedModel) innerModel).getChild(); + } + if (innerModel instanceof ModelImpl) { + ModelImpl mi = (ModelImpl) innerModel; + if (StringUtils.isNotEmpty(mi.getReference())) { + property = new RefProperty(mi.getReference()); + } else { + property = new RefProperty(mi.getName(), RefFormat.INTERNAL); + } + } + } + } + return property; + } + + private boolean _isReferenceType(JavaType propType) { + return Arrays.asList("com.google.common.base.Optional", "java.util.Optional") + .contains(propType.getRawClass().getCanonicalName()) || propType.isReferenceType(); + } + + @Override + public Model resolve(Type type, ModelConverterContext context, Iterator next) { + if (this.shouldIgnoreClass(type)) { + return null; + } + + return resolve(_mapper.constructType(type), context, next); + } + + protected void _addEnumProps(Class propClass, StringProperty property) { + final boolean useIndex = _mapper.isEnabled(SerializationFeature.WRITE_ENUMS_USING_INDEX); + final boolean useToString = _mapper.isEnabled(SerializationFeature.WRITE_ENUMS_USING_TO_STRING); + + Method jsonValueMethod = null; + Method[] methodList = propClass.getMethods(); + for (Method m : methodList) { + if (m.isAnnotationPresent(JsonValue.class) + && m.getAnnotation(JsonValue.class).value()) { + jsonValueMethod = m; + break; + } + } + + @SuppressWarnings("unchecked") + Class> enumClass = (Class>) propClass; + + Enum[] enumConstants = enumClass.getEnumConstants(); + if (enumConstants == null) { + return; + } + String[] enumValues = _intr.findEnumValues(propClass, enumConstants, new String[enumConstants.length]); + + for (Enum en : enumConstants) { + String s = null; + String enumValue = enumValues[en.ordinal()]; + if (jsonValueMethod != null) { + Object invokeResult = ReflectionUtils.safeInvoke(jsonValueMethod, en); + if (invokeResult != null) { + s = invokeResult.toString(); + } + } + + String n; + if (s != null) { + n = s; + } else if (enumValue != null) { + n = enumValue; + } else if (useIndex) { + n = String.valueOf(en.ordinal()); + } else if (useToString) { + n = en.toString(); + } else { + n = en.name(); + } + property._enum(n); + } + + if (!useIndex && !useToString) { + property._enum(Arrays.asList(_intr.findEnumValues(propClass, enumClass.getEnumConstants(), property.getEnum().toArray(new String[0])))); + } + } + + public Model resolve(JavaType type, ModelConverterContext context, Iterator next) { + if (type.isEnumType() || PrimitiveType.fromType(type) != null) { + // We don't build models for primitive types + return null; + } + + BeanDescription beanDesc = _mapper.getSerializationConfig().introspect(type); + // Couple of possibilities for defining + String name = _typeName(type, beanDesc); + + if ("Object".equals(name)) { + return new ModelImpl(); + } + + name = decorateModelName(context, name); + + /** + * --Preventing parent/child hierarchy creation loops - Comment 1-- + * Creating a parent model will result in the creation of child models. Creating a child model will result in + * the creation of a parent model, as per the second If statement following this comment. + * + * By checking whether a model has already been resolved (as implemented below), loops of parents creating + * children and children creating parents can be short-circuited. This works because currently the + * ModelConverterContextImpl will return null for a class that already been processed, but has not yet been + * defined. This logic works in conjunction with the early immediate definition of model in the context + * implemented later in this method (See "Preventing parent/child hierarchy creation loops - Comment 2") to + * prevent such + */ + Model resolvedModel = context.resolve(type.getRawClass()); + if (resolvedModel != null) { + if (!(resolvedModel instanceof ModelImpl || resolvedModel instanceof ComposedModel) + || (resolvedModel instanceof ModelImpl && ((ModelImpl) resolvedModel).getName().equals(name))) { + return resolvedModel; + } else if (resolvedModel instanceof ComposedModel) { + Model childModel = ((ComposedModel) resolvedModel).getChild(); + if (childModel != null && (!(childModel instanceof ModelImpl) + || ((ModelImpl) childModel).getName().equals(name))) { + return resolvedModel; + } + } + } + + final ModelImpl model = new ModelImpl().type(ModelImpl.OBJECT).name(name) + .description(_description(beanDesc.getClassInfo())); + + if (!type.isContainerType()) { + // define the model here to support self/cyclic referencing of models + context.defineModel(name, model, type, null); + } + + if (type.isContainerType()) { + // We treat collections as primitive types, just need to add models for values (if any) + context.resolve(type.getContentType()); + return null; + } + + final ApiModel apiModel = beanDesc.getClassAnnotations().get(ApiModel.class); + if (apiModel != null && StringUtils.isNotEmpty(apiModel.reference())) { + model.setReference(apiModel.reference()); + } + + // if XmlRootElement annotation, construct an Xml object and attach it to the model + XmlRootElement rootAnnotation = beanDesc.getClassAnnotations().get(XmlRootElement.class); + if (rootAnnotation != null && !"".equals(rootAnnotation.name()) && !"##default".equals(rootAnnotation.name())) { + LOGGER.debug("{}", rootAnnotation); + Xml xml = new Xml().name(rootAnnotation.name()); + if (rootAnnotation.namespace() != null && !"".equals(rootAnnotation.namespace()) && !"##default".equals(rootAnnotation.namespace())) { + xml.namespace(rootAnnotation.namespace()); + } else { + // If namespace was not given in the annotation, look for it in package-info + Package pkg = type.getRawClass().getPackage(); + if (pkg != null) { + XmlSchema xmlSchma = pkg.getAnnotation(XmlSchema.class); + if (xmlSchma != null) { + xml.namespace(xmlSchma.namespace()); + } + } + } + model.xml(xml); + } + final XmlAccessorType xmlAccessorTypeAnnotation = beanDesc.getClassAnnotations().get(XmlAccessorType.class); + + //If JsonSerialize(as=...) is specified then use that bean to figure out all the json-like bits + JsonSerialize jasonSerialize = beanDesc.getClassAnnotations().get(JsonSerialize.class); + if (jasonSerialize != null) { + if (jasonSerialize.as() != Void.class) { + JavaType asType = _mapper.constructType(jasonSerialize.as()); + beanDesc = _mapper.getSerializationConfig().introspect(asType); + } + } + + // see if @JsonIgnoreProperties exist + Set propertiesToIgnore = new HashSet(); + JsonIgnoreProperties ignoreProperties = beanDesc.getClassAnnotations().get(JsonIgnoreProperties.class); + if (ignoreProperties != null) { + propertiesToIgnore.addAll(Arrays.asList(ignoreProperties.value())); + } + + String disc = (apiModel == null) ? "" : apiModel.discriminator(); + if (disc.isEmpty()) { + // longer method would involve AnnotationIntrospector.findTypeResolver(...) but: + JsonTypeInfo typeInfo = beanDesc.getClassAnnotations().get(JsonTypeInfo.class); + if (typeInfo != null) { + disc = typeInfo.property(); + } + } + if (!disc.isEmpty()) { + model.setDiscriminator(disc); + } + + List props = new ArrayList(); + for (BeanPropertyDefinition propDef : beanDesc.findProperties()) { + Property property = null; + String propName = propDef.getName(); + Annotation[] annotations = null; + + // hack to avoid clobbering properties with get/is names + // it's ugly but gets around https://github.com/swagger-api/swagger-core/issues/415 + if (propDef.getPrimaryMember() != null) { + java.lang.reflect.Member member = propDef.getPrimaryMember().getMember(); + JsonProperty jsonPropertyAnn = propDef.getPrimaryMember().getAnnotation(JsonProperty.class); + if (jsonPropertyAnn == null || !jsonPropertyAnn.value().equals(propName)) { + if (member != null) { + String altName = member.getName(); + if (altName != null) { + final int length = altName.length(); + for (String prefix : Arrays.asList("get", "is")) { + final int offset = prefix.length(); + if (altName.startsWith(prefix) && length > offset + && !Character.isUpperCase(altName.charAt(offset))) { + propName = altName; + break; + } + } + } + } + } + } + + PropertyMetadata md = propDef.getMetadata(); + + boolean hasSetter = false, hasGetter = false; + try { + if (propDef.getSetter() == null) { + hasSetter = false; + } else { + hasSetter = true; + } + } catch (IllegalArgumentException e){ + //com.fasterxml.jackson.databind.introspect.POJOPropertyBuilder would throw IllegalArgumentException + // if there are overloaded setters. If we only want to know whether a set method exists, suppress the exception + // is reasonable. + // More logs might be added here + hasSetter = true; + } + if (propDef.getGetter() != null) { + JsonProperty pd = propDef.getGetter().getAnnotation(JsonProperty.class); + if (pd != null) { + hasGetter = true; + } + } + Boolean isReadOnly = null; + if (!hasSetter & hasGetter) { + isReadOnly = Boolean.TRUE; + } else { + isReadOnly = Boolean.FALSE; + } + + final AnnotatedMember member = propDef.getPrimaryMember(); + Boolean allowEmptyValue = null; + + if (member != null && !ignore(member, xmlAccessorTypeAnnotation, propName, propertiesToIgnore)) { + List annotationList = new ArrayList(); + for (Annotation a : member.annotations()) { + annotationList.add(a); + } + + annotations = annotationList.toArray(new Annotation[annotationList.size()]); + if (hiddenByJsonView(annotations, context)) { + continue; + } + + ApiModelProperty mp = member.getAnnotation(ApiModelProperty.class); + + if (mp != null && mp.readOnly()) { + isReadOnly = mp.readOnly(); + } + + if (mp != null && mp.allowEmptyValue()) { + allowEmptyValue = mp.allowEmptyValue(); + } else { + allowEmptyValue = null; + } + + JavaType propType = member.getType(); + + // allow override of name from annotation + if (mp != null && !mp.name().isEmpty()) { + propName = mp.name(); + } + + if (mp != null && !mp.dataType().isEmpty()) { + String or = mp.dataType(); + + JavaType innerJavaType = null; + LOGGER.debug("overriding datatype from {} to {}", propType, or); + + if (or.toLowerCase().startsWith("list[")) { + String innerType = or.substring(5, or.length() - 1); + ArrayProperty p = new ArrayProperty(); + Property primitiveProperty = PrimitiveType.createProperty(innerType); + if (primitiveProperty != null) { + p.setItems(primitiveProperty); + } else { + innerJavaType = getInnerType(innerType); + p.setItems(context.resolveProperty(innerJavaType, annotations)); + } + property = p; + } else if (or.toLowerCase().startsWith("map[")) { + int pos = or.indexOf(","); + if (pos > 0) { + String innerType = or.substring(pos + 1, or.length() - 1); + MapProperty p = new MapProperty(); + Property primitiveProperty = PrimitiveType.createProperty(innerType); + if (primitiveProperty != null) { + p.setAdditionalProperties(primitiveProperty); + } else { + innerJavaType = getInnerType(innerType); + p.setAdditionalProperties(context.resolveProperty(innerJavaType, annotations)); + } + property = p; + } + } else { + Property primitiveProperty = PrimitiveType.createProperty(or); + if (primitiveProperty != null) { + property = primitiveProperty; + } else { + innerJavaType = getInnerType(or); + property = context.resolveProperty(innerJavaType, annotations); + } + } + if (innerJavaType != null) { + context.resolve(innerJavaType); + } + } + + // no property from override, construct from propType + if (property == null) { + if (mp != null && StringUtils.isNotEmpty(mp.reference())) { + property = new RefProperty(mp.reference()); + } else if (member.getAnnotation(JsonIdentityInfo.class) != null) { + property = GeneratorWrapper.processJsonIdentity(propType, context, _mapper, + member.getAnnotation(JsonIdentityInfo.class), + member.getAnnotation(JsonIdentityReference.class)); + } + if (property == null) { + JsonUnwrapped uw = member.getAnnotation(JsonUnwrapped.class); + if (uw != null && uw.enabled()) { + handleUnwrapped(props, context.resolve(propType), uw.prefix(), uw.suffix()); + } else { + property = context.resolveProperty(propType, annotations); + } + } + } + + if (property != null) { + property.setName(propName); + + if (mp != null && !mp.access().isEmpty()) { + property.setAccess(mp.access()); + } + + Boolean required = md.getRequired(); + if (required != null) { + property.setRequired(required); + } + + String description = _intr.findPropertyDescription(member); + if (description != null && !"".equals(description)) { + property.setDescription(description); + } + + Integer index = _intr.findPropertyIndex(member); + if (index != null) { + property.setPosition(index); + } + property.setDefault(_findDefaultValue(member)); + property.setExample(_findExampleValue(member)); + property.setReadOnly(_findReadOnly(member)); + if (allowEmptyValue != null) { + property.setAllowEmptyValue(allowEmptyValue); + } + + if (property.getReadOnly() == null) { + if (isReadOnly) { + property.setReadOnly(isReadOnly); + } + } + + // keep read-only handling code unaltered to maintain backward compatibility/behaviour, + // but also process new (since 1.5.19) ApiModelProperty.accessMode annotation field. + Boolean readOnlyFromAccessMode = _findReadOnlyFromAccessMode(member); + if (readOnlyFromAccessMode != null) { + property.setReadOnly(readOnlyFromAccessMode); + } + + if (mp != null) { + final AllowableValues allowableValues = AllowableValuesUtils.create(mp.allowableValues()); + if (allowableValues != null) { + final Map args = allowableValues.asPropertyArguments(); + PropertyBuilder.merge(property, args); + } + } + + if (mp != null && mp.extensions() != null) { + property.getVendorExtensions().clear(); + property.getVendorExtensions().putAll(BaseReaderUtils.parseExtensions(mp.extensions())); + } + + JAXBAnnotationsHelperAdapterJakarta.apply(member, property); + applyBeanValidatorAnnotations(property, annotations); + props.add(property); + } + } + } + + Collections.sort(props, getPropertyComparator()); + + Map modelProps = new LinkedHashMap(); + for (Property prop : props) { + modelProps.put(prop.getName(), prop); + } + model.setProperties(modelProps); + + /** + * --Preventing parent/child hierarchy creation loops - Comment 2-- + * Creating a parent model will result in the creation of child models, as per the first If statement following + * this comment. Creating a child model will result in the creation of a parent model, as per the second If + * statement following this comment. + * + * The current model must be defined in the context immediately. This done to help prevent repeated + * loops where parents create children and children create parents when a hierarchy is present. This logic + * works in conjunction with the "early checking" performed earlier in this method + * (See "Preventing parent/child hierarchy creation loops - Comment 1"), to prevent repeated creation loops. + * + * + * As an aside, defining the current model in the context immediately also ensures that child models are + * available for modification by resolveSubtypes, when their parents are created. + */ + Class currentType = type.getRawClass(); + context.defineModel(name, model, currentType, null); + + /** + * This must be done after model.setProperties so that the model's set + * of properties is available to filter from any subtypes + **/ + if (!resolveSubtypes(model, beanDesc, context)) { + model.setDiscriminator(null); + } + + if (apiModel != null) { + /** + * Check if the @ApiModel annotation has a parent property containing a value that should not be ignored + */ + Class parentClass = apiModel.parent(); + if (parentClass != null && !parentClass.equals(Void.class) && !this.shouldIgnoreClass(parentClass)) { + JavaType parentType = _mapper.constructType(parentClass); + final BeanDescription parentBeanDesc = _mapper.getSerializationConfig().introspect(parentType); + + /** + * Retrieve all the sub-types of the parent class and ensure that the current type is one of those types + */ + boolean currentTypeIsParentSubType = false; + List subTypes = _intr.findSubtypes(parentBeanDesc.getClassInfo()); + if (subTypes != null) { + for (NamedType subType : subTypes) { + if (subType.getType().equals(currentType)) { + currentTypeIsParentSubType = true; + break; + } + } + } + + /** + Retrieve the subTypes from the parent class @ApiModel annotation and ensure that the current type + is one of those types. + */ + boolean currentTypeIsParentApiModelSubType = false; + final ApiModel parentApiModel = parentBeanDesc.getClassAnnotations().get(ApiModel.class); + if (parentApiModel != null) { + Class[] apiModelSubTypes = parentApiModel.subTypes(); + if (apiModelSubTypes != null) { + for (Class subType : apiModelSubTypes) { + if (subType.equals(currentType)) { + currentTypeIsParentApiModelSubType = true; + break; + } + } + } + } + + /** + If the current type is a sub-type of the parent class and is listed in the subTypes property of the + parent class @ApiModel annotation, then do the following: + 1. Resolve the model for the parent class. This will result in the parent model being created, and the + current child model being updated to be a ComposedModel referencing the parent. + 2. Resolve and return the current child type again. This will return the new ComposedModel from the + context, which was created in step 1 above. Admittedly, there is a small chance that this may result + in a stack overflow, if the context does not correctly cache the model for the current type. However, + as context caching is assumed elsewhere to avoid cyclical model creation, this was deemed to be + sufficient. + */ + if (currentTypeIsParentSubType && currentTypeIsParentApiModelSubType) { + context.resolve(parentClass); + return context.resolve(currentType); + } + } + } + + return model; + } + + /** + * Decorate the name based on the JsonView + */ + protected String decorateModelName(ModelConverterContext context, String originalName) { + String name = originalName; + if (context.getJsonView() != null && context.getJsonView().value().length > 0) { + String combiner = "-or-"; + StringBuffer sb = new StringBuffer(); + for (Class view : context.getJsonView().value()) { + sb.append(view.getSimpleName()).append(combiner); + } + String suffix = sb.toString().substring(0, sb.length() - combiner.length()); + name = originalName + "_" + suffix; + } + return name; + } + + private boolean hiddenByJsonView(Annotation[] annotations, + ModelConverterContext context) { + JsonView jsonView = context.getJsonView(); + if (jsonView == null) { + return false; + } + Class[] filters = jsonView.value(); + boolean containsJsonViewAnnotation = false; + for (Annotation ant : annotations) { + if (ant instanceof JsonView) { + containsJsonViewAnnotation = true; + Class[] views = ((JsonView) ant).value(); + for (Class f : filters) { + for (Class v : views) { + if (v == f || v.isAssignableFrom(f)) { + return false; + } + } + } + } + } + return containsJsonViewAnnotation; + } + + protected boolean ignore(final Annotated member, final XmlAccessorType xmlAccessorTypeAnnotation, final String propName, final Set propertiesToIgnore) { + if (propertiesToIgnore.contains(propName)) { + return true; + } + if (member.hasAnnotation(JsonIgnore.class)) { + return true; + } + if (xmlAccessorTypeAnnotation == null) { + return false; + } + if (xmlAccessorTypeAnnotation.value().equals(XmlAccessType.NONE)) { + if (!member.hasAnnotation(XmlElement.class) && + !member.hasAnnotation(XmlAttribute.class) && + !member.hasAnnotation(XmlElementRef.class) && + !member.hasAnnotation(XmlElementRefs.class) && + !member.hasAnnotation(JsonProperty.class)) { + return true; + } + } + return false; + } + + private void handleUnwrapped(List props, Model innerModel, String prefix, String suffix) { + if (StringUtils.isBlank(suffix) && StringUtils.isBlank(prefix)) { + if (innerModel != null) { + Map innerProps = innerModel.getProperties(); + if (innerProps != null) { + props.addAll(innerProps.values()); + } + } + } else { + if (prefix == null) { + prefix = ""; + } + if (suffix == null) { + suffix = ""; + } + for (Property prop : innerModel.getProperties().values()) { + props.add(prop.rename(prefix + prop.getName() + suffix)); + } + } + } + + private enum GeneratorWrapper { + PROPERTY(ObjectIdGenerators.PropertyGenerator.class) { + @Override + protected Property processAsProperty(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + /* + * When generator = ObjectIdGenerators.PropertyGenerator.class and + * @JsonIdentityReference(alwaysAsId = false) then property is serialized + * in the same way it is done without @JsonIdentityInfo annotation. + */ + return null; + } + + @Override + protected Property processAsId(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + final BeanDescription beanDesc = mapper.getSerializationConfig().introspect(type); + for (BeanPropertyDefinition def : beanDesc.findProperties()) { + final String name = def.getName(); + if (name != null && name.equals(propertyName)) { + final AnnotatedMember propMember = def.getPrimaryMember(); + final JavaType propType = propMember.getType(); + if (PrimitiveType.fromType(propType) != null) { + return PrimitiveType.createProperty(propType); + } else { + return context.resolveProperty(propType, + Iterables.toArray(propMember.annotations(), Annotation.class)); + } + } + } + return null; + } + }, + INT(ObjectIdGenerators.IntSequenceGenerator.class) { + @Override + protected Property processAsProperty(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + Property id = new IntegerProperty(); + return process(id, propertyName, type, context); + } + + @Override + protected Property processAsId(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + return new IntegerProperty(); + } + }, + UUID(ObjectIdGenerators.UUIDGenerator.class) { + @Override + protected Property processAsProperty(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + Property id = new UUIDProperty(); + return process(id, propertyName, type, context); + } + + @Override + protected Property processAsId(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + return new UUIDProperty(); + } + }, + NONE(ObjectIdGenerators.None.class) { + // When generator = ObjectIdGenerators.None.class property should be processed as normal property. + @Override + protected Property processAsProperty(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + return null; + } + + @Override + protected Property processAsId(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper) { + return null; + } + }; + + private final Class generator; + + GeneratorWrapper(Class generator) { + this.generator = generator; + } + + protected abstract Property processAsProperty(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper); + + protected abstract Property processAsId(String propertyName, JavaType type, + ModelConverterContext context, ObjectMapper mapper); + + public static Property processJsonIdentity(JavaType type, ModelConverterContext context, + ObjectMapper mapper, JsonIdentityInfo identityInfo, + JsonIdentityReference identityReference) { + final GeneratorWrapper wrapper = identityInfo != null ? getWrapper(identityInfo.generator()) : null; + if (wrapper == null) { + return null; + } + if (identityReference != null && identityReference.alwaysAsId()) { + return wrapper.processAsId(identityInfo.property(), type, context, mapper); + } else { + return wrapper.processAsProperty(identityInfo.property(), type, context, mapper); + } + } + + private static GeneratorWrapper getWrapper(Class generator) { + for (GeneratorWrapper value : GeneratorWrapper.values()) { + if (value.generator.isAssignableFrom(generator)) { + return value; + } + } + return null; + } + + private static Property process(Property id, String propertyName, JavaType type, + ModelConverterContext context) { + id.setName(propertyName); + Model model = context.resolve(type); + if (model instanceof ComposedModel) { + model = ((ComposedModel) model).getChild(); + } + if (model instanceof ModelImpl) { + ModelImpl mi = (ModelImpl) model; + mi.getProperties().put(propertyName, id); + return new RefProperty(StringUtils.isNotEmpty(mi.getReference()) + ? mi.getReference() : mi.getName()); + } + return null; + } + } + + protected void applyBeanValidatorAnnotations(Property property, Annotation[] annotations) { + Map annos = new HashMap(); + if (annotations != null) { + for (Annotation anno : annotations) { + annos.put(anno.annotationType().getName(), anno); + } + } + if (annos.containsKey("jakarta.validation.constraints.NotNull")) { + property.setRequired(true); + } + if (annos.containsKey("jakarta.validation.constraints.Min")) { + if (property instanceof AbstractNumericProperty) { + Min min = (Min) annos.get("jakarta.validation.constraints.Min"); + AbstractNumericProperty ap = (AbstractNumericProperty) property; + ap.setMinimum(new BigDecimal(min.value())); + } + } + if (annos.containsKey("jakarta.validation.constraints.Max")) { + if (property instanceof AbstractNumericProperty) { + Max max = (Max) annos.get("jakarta.validation.constraints.Max"); + AbstractNumericProperty ap = (AbstractNumericProperty) property; + ap.setMaximum(new BigDecimal(max.value())); + } + } + if (annos.containsKey("jakarta.validation.constraints.Size")) { + Size size = (Size) annos.get("jakarta.validation.constraints.Size"); + if (property instanceof AbstractNumericProperty) { + AbstractNumericProperty ap = (AbstractNumericProperty) property; + ap.setMinimum(new BigDecimal(size.min())); + ap.setMaximum(new BigDecimal(size.max())); + } else if (property instanceof StringProperty) { + StringProperty sp = (StringProperty) property; + sp.minLength(size.min()); + sp.maxLength(size.max()); + } else if (property instanceof ArrayProperty) { + ArrayProperty sp = (ArrayProperty) property; + sp.setMinItems(size.min()); + sp.setMaxItems(size.max()); + } + } + if (annos.containsKey("jakarta.validation.constraints.DecimalMin")) { + DecimalMin min = (DecimalMin) annos.get("jakarta.validation.constraints.DecimalMin"); + if (property instanceof AbstractNumericProperty) { + AbstractNumericProperty ap = (AbstractNumericProperty) property; + ap.setMinimum(new BigDecimal(min.value())); + ap.setExclusiveMinimum(!min.inclusive()); + } + } + if (annos.containsKey("jakarta.validation.constraints.DecimalMax")) { + DecimalMax max = (DecimalMax) annos.get("jakarta.validation.constraints.DecimalMax"); + if (property instanceof AbstractNumericProperty) { + AbstractNumericProperty ap = (AbstractNumericProperty) property; + ap.setMaximum(new BigDecimal(max.value())); + ap.setExclusiveMaximum(!max.inclusive()); + } + } + if (annos.containsKey("jakarta.validation.constraints.Pattern")) { + Pattern pattern = (Pattern) annos.get("jakarta.validation.constraints.Pattern"); + if (property instanceof StringProperty) { + StringProperty ap = (StringProperty) property; + ap.setPattern(pattern.regexp()); + } + } + } + + protected JavaType getInnerType(String innerType) { + try { + Class innerClass = ReflectionUtils.loadClassByName(innerType); + if (innerClass != null) { + TypeFactory tf = _mapper.getTypeFactory(); + return tf.constructType(innerClass); + } + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + return null; + } + + private boolean resolveSubtypes(ModelImpl model, BeanDescription bean, ModelConverterContext context) { + final List types = _intr.findSubtypes(bean.getClassInfo()); + + if (types == null) { + return false; + } + + /** + * Remove the current class from the child classes. This happens if @JsonSubTypes references + * the annotated class as a subtype. + */ + removeSelfFromSubTypes(types, bean); + + /** + * As the introspector will find @JsonSubTypes for a child class that are present on its super classes, the + * code segment below will also run the introspector on the parent class, and then remove any sub-types that are + * found for the parent from the sub-types found for the child. The same logic all applies to implemented + * interfaces, and is accounted for below. + */ + removeSuperClassAndInterfaceSubTypes(types, bean); + + int count = 0; + final Class beanClass = bean.getClassInfo().getAnnotated(); + for (NamedType subtype : types) { + final Class subtypeType = subtype.getType(); + if (!beanClass.isAssignableFrom(subtypeType)) { + continue; + } + + final Model subtypeModel = context.resolve(subtypeType); + + if (subtypeModel instanceof ModelImpl) { + final ModelImpl impl = (ModelImpl) subtypeModel; + + // check if model name was inherited + if (impl.getName().equals(model.getName())) { + impl.setName(_typeNameResolver.nameForType(_mapper.constructType(subtypeType), + TypeNameResolver.Options.SKIP_API_MODEL)); + } + + // remove shared properties defined in the parent + final Map baseProps = model.getProperties(); + final Map subtypeProps = impl.getProperties(); + if (baseProps != null && subtypeProps != null) { + for (Map.Entry entry : baseProps.entrySet()) { + if (entry.getValue().equals(subtypeProps.get(entry.getKey()))) { + subtypeProps.remove(entry.getKey()); + } + } + } + + impl.setDiscriminator(null); + ComposedModel child = new ComposedModel().parent(new RefModel(model.getName(), RefFormat.INTERNAL)).child(impl); + context.defineModel(impl.getName(), child, subtypeType, null); + ++count; + } + } + return count != 0; + } + + private void removeSelfFromSubTypes(List types, BeanDescription bean) { + Class beanClass = bean.getType().getRawClass(); + ListIterator iter = types.listIterator(); + while (iter.hasNext()) { + if (beanClass.equals(iter.next().getType())) { + iter.remove(); + } + } + } + + private void removeSuperClassAndInterfaceSubTypes(List types, BeanDescription bean) { + Class beanClass = bean.getType().getRawClass(); + Class superClass = beanClass.getSuperclass(); + if (superClass != null && !superClass.equals(Object.class)) { + removeSuperSubTypes(types, superClass); + } + if (!types.isEmpty()) { + Class[] superInterfaces = beanClass.getInterfaces(); + for (Class superInterface : superInterfaces) { + removeSuperSubTypes(types, superInterface); + if (types.isEmpty()) { + break; + } + } + } + } + + private void removeSuperSubTypes(List resultTypes, Class superClass) { + JavaType superType = _mapper.constructType(superClass); + BeanDescription superBean = _mapper.getSerializationConfig().introspect(superType); + final List superTypes = _intr.findSubtypes(superBean.getClassInfo()); + if (superTypes != null) { + resultTypes.removeAll(superTypes); + } + } +} diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ParameterProcessorAdapterJakarta.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ParameterProcessorAdapterJakarta.java new file mode 100644 index 00000000000..325466e7b56 --- /dev/null +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/ParameterProcessorAdapterJakarta.java @@ -0,0 +1,776 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.servicecomb.swagger.jakarta; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.math.BigDecimal; +import java.util.EnumMap; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiParam; +import io.swagger.annotations.Example; +import io.swagger.annotations.ExampleProperty; +import io.swagger.models.Model; +import io.swagger.models.Swagger; +import io.swagger.models.parameters.AbstractSerializableParameter; +import io.swagger.models.parameters.BodyParameter; +import io.swagger.models.parameters.Parameter; +import io.swagger.models.properties.AbstractNumericProperty; +import io.swagger.models.properties.ArrayProperty; +import io.swagger.models.properties.FileProperty; +import io.swagger.models.properties.LongProperty; +import io.swagger.models.properties.Property; +import io.swagger.models.properties.PropertyBuilder; +import io.swagger.models.properties.PropertyBuilder.PropertyId; +import io.swagger.models.properties.StringProperty; +import io.swagger.util.AllowableValues; +import io.swagger.util.AllowableValuesUtils; +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.Max; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; + +/** + * replace io.swagger.util.ParameterProcessor to adapter JAVAEE9 jakarta API + * modifying content: javax API dependency changing to the jakarta API dependency. + */ +public class ParameterProcessorAdapterJakarta { + private static final Logger LOGGER = LoggerFactory.getLogger(ParameterProcessorAdapterJakarta.class); + + public static Parameter applyAnnotations( + Swagger swagger, Parameter parameter, Type type, List annotations) { + final ParameterProcessorAdapterJakarta.AnnotationsHelper helper + = new ParameterProcessorAdapterJakarta.AnnotationsHelper(annotations, type); + if (helper.isContext()) { + return null; + } + final ParameterProcessorAdapterJakarta.ParamWrapper param = helper.getApiParam(); + if (param.isHidden()) { + return null; + } + final String defaultValue = helper.getDefaultValue(); + if (parameter instanceof AbstractSerializableParameter) { + final AbstractSerializableParameter p = (AbstractSerializableParameter) parameter; + + if (param.isRequired()) { + p.setRequired(true); + } + if (param.getReadOnly()) { + p.readOnly(param.getReadOnly()); + } + if (param.getAllowEmptyValue()) { + p.allowEmptyValue(param.getAllowEmptyValue()); + } + if (StringUtils.isNotEmpty(param.getName())) { + p.setName(param.getName()); + } + if (StringUtils.isNotEmpty(param.getDescription())) { + p.setDescription(param.getDescription()); + } + if (StringUtils.isNotEmpty(param.getExample())) { + p.setExample(param.getExample()); + } + if (StringUtils.isNotEmpty(param.getAccess())) { + p.setAccess(param.getAccess()); + } + if (StringUtils.isNoneEmpty(param.getCollectionFormat())) { + p.setCollectionFormat(param.getCollectionFormat()); + } + if (StringUtils.isNotEmpty(param.getDataType())) { + if ("java.io.File".equalsIgnoreCase(param.getDataType())) { + p.setProperty(new FileProperty()); + } else if ("long".equalsIgnoreCase(param.getDataType())) { + p.setProperty(new LongProperty()); + } else { + p.setType(param.getDataType()); + } + } + if (helper.getMin() != null) { + p.setMinimum(helper.getMin()); + if (helper.isMinExclusive()) { + p.setExclusiveMinimum(true); + } + } + + if (helper.getMax() != null) { + p.setMaximum(helper.getMax()); + if (helper.isMaxExclusive()) { + p.setExclusiveMaximum(true); + } + } + + if (helper.getMinItems() != null) { + p.setMinItems(helper.getMinItems()); + } + if (helper.getMaxItems() != null) { + p.setMaxItems(helper.getMaxItems()); + } + + if (helper.getMinLength() != null) { + p.setMinLength(helper.getMinLength()); + } + if (helper.getMaxLength() != null) { + p.setMaxLength(helper.getMaxLength()); + } + + if (helper.getPattern() != null) { + p.setPattern(helper.getPattern()); + } + + if (helper.isRequired() != null) { + p.setRequired(true); + } + if (helper.getType() != null) { + p.setType(helper.getType()); + } + if (helper.getFormat() != null) { + p.setFormat(helper.getFormat()); + } + + AllowableValues allowableValues = AllowableValuesUtils.create(param.getAllowableValues()); + + if (p.getItems() != null || param.isAllowMultiple()) { + if (p.getItems() == null) { + // Convert to array + final Map args = new EnumMap(PropertyBuilder.PropertyId.class); + args.put(PropertyBuilder.PropertyId.DEFAULT, p.getDefaultValue()); + p.setDefaultValue(null); + args.put(PropertyBuilder.PropertyId.ENUM, p.getEnum()); + p.setEnum(null); + args.put(PropertyBuilder.PropertyId.MINIMUM, p.getMinimum()); + p.setMinimum(null); + args.put(PropertyBuilder.PropertyId.EXCLUSIVE_MINIMUM, p.isExclusiveMinimum()); + p.setExclusiveMinimum(null); + args.put(PropertyBuilder.PropertyId.MAXIMUM, p.getMaximum()); + p.setMaximum(null); + args.put(PropertyBuilder.PropertyId.EXCLUSIVE_MAXIMUM, p.isExclusiveMaximum()); + args.put(PropertyBuilder.PropertyId.MIN_LENGTH, p.getMinLength()); + p.setMinLength(null); + args.put(PropertyBuilder.PropertyId.MAX_LENGTH, p.getMaxLength()); + p.setMaxLength(null); + args.put(PropertyBuilder.PropertyId.PATTERN, p.getPattern()); + p.setPattern(null); + args.put(PropertyBuilder.PropertyId.EXAMPLE, p.getExample()); + p.setExclusiveMaximum(null); + Property items = PropertyBuilder.build(p.getType(), p.getFormat(), args); + p.type(ArrayProperty.TYPE).format(null).items(items); + } + + final Map args = new EnumMap(PropertyBuilder.PropertyId.class); + if (StringUtils.isNotEmpty(defaultValue)) { + args.put(PropertyBuilder.PropertyId.DEFAULT, defaultValue); + } + + /** + * Use jsr-303 annotations (and other bean validation annotations) if present. This essentially implies + * that the bean validation constraints now apply to the items and not to the parent collection/array. + * Although this will work for swagger definition purposes, there is no default validator for many of + * the validator annotations when applied to a collection/array. For example, a @Min annotation applied + * to a List>Long< will result in a swagger definition which contains an array property with items + * of type number and having a 'minimum' validation constraint. However, there is no default bean + * validator for @Min when applied to a List>Long<, and the developer would need to implement such + * a validator themselves. + */ + + if (helper.getMin() != null) { + args.put(PropertyBuilder.PropertyId.MINIMUM, + helper.getMin()); + if (helper.isMinExclusive()) { + args.put(PropertyBuilder.PropertyId.EXCLUSIVE_MINIMUM, true); + } + } + + if (helper.getMax() != null) { + args.put(PropertyBuilder.PropertyId.MAXIMUM, + helper.getMax()); + if (helper.isMaxExclusive()) { + args.put(PropertyBuilder.PropertyId.EXCLUSIVE_MAXIMUM, true); + } + } + + if (helper.getMinLength() != null) { + args.put(PropertyBuilder.PropertyId.MIN_LENGTH, helper.getMinLength()); + } + if (helper.getMaxLength() != null) { + args.put(PropertyBuilder.PropertyId.MAX_LENGTH, helper.getMaxLength()); + } + if (helper.getPattern() != null) { + args.put(PropertyBuilder.PropertyId.PATTERN, helper.getPattern()); + } + + //Overwrite Bean validation values with allowable values if present + if (allowableValues != null) { + args.putAll(allowableValues.asPropertyArguments()); + } + PropertyBuilder.merge(p.getItems(), args); + } else { + if (StringUtils.isNotEmpty(defaultValue)) { + p.setDefaultValue(defaultValue); + } + + //Overwrite Bean validation values with allowable values if present + if (allowableValues != null) { + processAllowedValues(allowableValues, p); + } +// else { +// processJsr303Annotations(helper, p); +// } + } + } else { + // must be a body param + BodyParameter bp = new BodyParameter(); + + if (helper.getApiParam() != null) { + ParameterProcessorAdapterJakarta.ParamWrapper pw = helper.getApiParam(); + + if (pw instanceof ParameterProcessorAdapterJakarta.ApiParamWrapper) { + ParameterProcessorAdapterJakarta.ApiParamWrapper apiParam = (ParameterProcessorAdapterJakarta.ApiParamWrapper) pw; + Example example = apiParam.getExamples(); + if (example != null && example.value() != null) { + for (ExampleProperty ex : example.value()) { + String mediaType = ex.mediaType(); + String value = ex.value(); + if (!mediaType.isEmpty() && !value.isEmpty()) { + bp.example(mediaType.trim(), value.trim()); + } + } + } + } else if (pw instanceof ParameterProcessorAdapterJakarta.ApiImplicitParamWrapper) { + ParameterProcessorAdapterJakarta.ApiImplicitParamWrapper apiParam + = (ParameterProcessorAdapterJakarta.ApiImplicitParamWrapper) pw; + Example example = apiParam.getExamples(); + if (example != null && example.value() != null) { + for (ExampleProperty ex : example.value()) { + String mediaType = ex.mediaType(); + String value = ex.value(); + if (!mediaType.isEmpty() && !value.isEmpty()) { + bp.example(mediaType.trim(), value.trim()); + } + } + } + } + } + bp.setRequired(param.isRequired()); + bp.setName(StringUtils.isNotEmpty(param.getName()) ? param.getName() : "body"); + + if (StringUtils.isNotEmpty(param.getDescription())) { + bp.setDescription(param.getDescription()); + } + + if (StringUtils.isNotEmpty(param.getAccess())) { + bp.setAccess(param.getAccess()); + } + + final Property property = ModelConvertersAdapterJakarta.getInstance().readAsProperty(type); + if (property != null) { + final Map args = new EnumMap(PropertyBuilder.PropertyId.class); + if (StringUtils.isNotEmpty(defaultValue)) { + args.put(PropertyBuilder.PropertyId.DEFAULT, defaultValue); + } + bp.setSchema(PropertyBuilder.toModel(PropertyBuilder.merge(property, args))); + for (Map.Entry entry : ModelConvertersAdapterJakarta.getInstance().readAll(type).entrySet()) { + swagger.addDefinition(entry.getKey(), entry.getValue()); + } + } + parameter = bp; + } + return parameter; + } + + private static void processAllowedValues(AllowableValues allowableValues, AbstractSerializableParameter p) { + if (allowableValues == null) { + return; + } + Map args = allowableValues.asPropertyArguments(); + if (args.containsKey(PropertyBuilder.PropertyId.ENUM)) { + p.setEnum((List) args.get(PropertyBuilder.PropertyId.ENUM)); + } else { + if (args.containsKey(PropertyBuilder.PropertyId.MINIMUM)) { + p.setMinimum((BigDecimal) args.get(PropertyBuilder.PropertyId.MINIMUM)); + } + if (args.containsKey(PropertyBuilder.PropertyId.MAXIMUM)) { + p.setMaximum((BigDecimal) args.get(PropertyBuilder.PropertyId.MAXIMUM)); + } + if (args.containsKey(PropertyBuilder.PropertyId.EXCLUSIVE_MINIMUM)) { + p.setExclusiveMinimum((Boolean) args.get(PropertyBuilder.PropertyId.EXCLUSIVE_MINIMUM) ? true : null); + } + if (args.containsKey(PropertyBuilder.PropertyId.EXCLUSIVE_MAXIMUM)) { + p.setExclusiveMaximum((Boolean) args.get(PropertyBuilder.PropertyId.EXCLUSIVE_MAXIMUM) ? true : null); + } + } + } + + private static void processJsr303Annotations(ParameterProcessorAdapterJakarta.AnnotationsHelper helper, + AbstractSerializableParameter p) { + if (helper == null) { + return; + } + if (helper.getMin() != null) { + p.setMinimum(helper.getMin()); + } + if (helper.getMax() != null) { + p.setMaximum(helper.getMax()); + } + } + + /** + * Wraps either an @ApiParam or and @ApiImplicitParam + */ + + public interface ParamWrapper { + String getName(); + + String getDescription(); + + String getDefaultValue(); + + String getAllowableValues(); + + boolean isRequired(); + + String getAccess(); + + boolean isAllowMultiple(); + + String getDataType(); + + String getParamType(); + + T getAnnotation(); + + boolean isHidden(); + + String getExample(); + + String getType(); + + String getFormat(); + + boolean getReadOnly(); + + boolean getAllowEmptyValue(); + + String getCollectionFormat(); + } + + /** + * The AnnotationsHelper class defines helper methods for + * accessing supported parameter annotations. + */ + private static class AnnotationsHelper { + private static final ApiParam DEFAULT_API_PARAM = getDefaultApiParam(null); + private boolean context; + private ParameterProcessorAdapterJakarta.ParamWrapper apiParam + = new ParameterProcessorAdapterJakarta.ApiParamWrapper(DEFAULT_API_PARAM); + private String type; + private String format; + private String defaultValue; + private Integer minItems; + private Integer maxItems; + private Boolean required; + private BigDecimal min; + private boolean minExclusive = false; + private BigDecimal max; + private boolean maxExclusive = false; + private Integer minLength; + private Integer maxLength; + private String pattern; + private Boolean allowEmptyValue; + private String collectionFormat; + + /** + * Constructs an instance. + * + * @param annotations array or parameter annotations + */ + public AnnotationsHelper(List annotations, Type _type) { + String rsDefault = null; + Size size = null; + for (Annotation item : annotations) { + if ("jakarta.ws.rs.core.Context".equals(item.annotationType().getName())) { + context = true; + } else if (item instanceof ApiParam) { + apiParam = new ParameterProcessorAdapterJakarta.ApiParamWrapper((ApiParam) item); + } else if (item instanceof ApiImplicitParam) { + apiParam = new ParameterProcessorAdapterJakarta.ApiImplicitParamWrapper((ApiImplicitParam) item); + } else if ("jakarta.ws.rs.DefaultValue".equals(item.annotationType().getName())) { + try { + rsDefault = (String) item.annotationType().getMethod("value").invoke(item); + } catch (Exception ex) { + LOGGER.error("Invocation of value method failed", ex); + } + } else if (item instanceof Size) { + size = (Size) item; + /** + * This annotation is handled after the loop, as the allow multiple field of the + * ApiParam annotation can affect how the Size annotation is translated + * Swagger property constraints + */ + } else if (item instanceof NotNull) { + required = true; + } else if (item instanceof Min) { + min = new BigDecimal(((Min) item).value()); + } else if (item instanceof Max) { + max = new BigDecimal(((Max) item).value()); + } else if (item instanceof DecimalMin) { + DecimalMin decimalMinAnnotation = (DecimalMin) item; + min = new BigDecimal(decimalMinAnnotation.value()); + minExclusive = !decimalMinAnnotation.inclusive(); + } else if (item instanceof DecimalMax) { + DecimalMax decimalMaxAnnotation = (DecimalMax) item; + max = new BigDecimal(decimalMaxAnnotation.value()); + maxExclusive = !decimalMaxAnnotation.inclusive(); + } else if (item instanceof Pattern) { + pattern = ((Pattern) item).regexp(); + } + } + if (size != null) { + Property property = ModelConvertersAdapterJakarta.getInstance().readAsProperty(_type); + boolean defaultToArray = apiParam != null && apiParam.isAllowMultiple(); + if (!defaultToArray && property instanceof AbstractNumericProperty) { + min = new BigDecimal(size.min()); + max = new BigDecimal(size.max()); + } else if (!defaultToArray && property instanceof StringProperty) { + minLength = size.min(); + maxLength = size.max(); + } else { + minItems = size.min(); + maxItems = size.max(); + } + } + defaultValue = StringUtils.isNotEmpty(apiParam.getDefaultValue()) ? apiParam.getDefaultValue() : rsDefault; + type = StringUtils.isNotEmpty(apiParam.getType()) ? apiParam.getType() : null; + format = StringUtils.isNotEmpty(apiParam.getFormat()) ? apiParam.getFormat() : null; + allowEmptyValue = apiParam.isAllowMultiple() ? true : null; + collectionFormat = StringUtils.isNoneEmpty(apiParam.getCollectionFormat()) ? apiParam.getCollectionFormat() : null; + } + + private boolean isAssignableToNumber(Class clazz) { + return Number.class.isAssignableFrom(clazz) + || int.class.isAssignableFrom(clazz) + || short.class.isAssignableFrom(clazz) + || long.class.isAssignableFrom(clazz) + || float.class.isAssignableFrom(clazz) + || double.class.isAssignableFrom(clazz); + } + + /** + * Returns a default @{@link ApiParam} annotation for parameters without it. + * + * @param annotationHolder a placeholder for default @{@link ApiParam} + * annotation + * @return @{@link ApiParam} annotation + */ + private static ApiParam getDefaultApiParam(@ApiParam String annotationHolder) { + for (Method method : ParameterProcessorAdapterJakarta.AnnotationsHelper.class.getDeclaredMethods()) { + if ("getDefaultApiParam".equals(method.getName())) { + return (ApiParam) method.getParameterAnnotations()[0][0]; + } + } + throw new IllegalStateException("Failed to locate default @ApiParam"); + } + + /** + * Checks whether the @{@link Context} annotation is present. + * + * @return true if parameter is defined with the @{@link Context} annotation + */ + public boolean isContext() { + return context; + } + + /** + * Returns @{@link ApiParam} annotation. If no @{@link ApiParam} is present + * a default one will be returned. + * + * @return @{@link ApiParam} annotation + */ + public ParameterProcessorAdapterJakarta.ParamWrapper getApiParam() { + return apiParam; + } + + /** + * Returns default value from annotation. + * + * @return default value from annotation + */ + public String getDefaultValue() { + return defaultValue; + } + + public Integer getMinItems() { + return minItems; + } + + public Integer getMaxItems() { + return maxItems; + } + + public Boolean isRequired() { + return required; + } + + public BigDecimal getMax() { + return max; + } + + public boolean isMaxExclusive() { + return maxExclusive; + } + + public BigDecimal getMin() { + return min; + } + + public String getType() { + return type; + } + + public String getFormat() { + return format; + } + + public boolean isMinExclusive() { + return minExclusive; + } + + public Integer getMinLength() { + return minLength; + } + + public Integer getMaxLength() { + return maxLength; + } + + public String getPattern() { + return pattern; + } + + public Boolean getAllowEmptyValue() { + return allowEmptyValue; + } + + public String getCollectionFormat() { + return collectionFormat; + } + } + + /** + * Wrapper implementation for ApiParam annotation + */ + + private static final class ApiParamWrapper implements ParameterProcessorAdapterJakarta.ParamWrapper { + + private final ApiParam apiParam; + + private ApiParamWrapper(ApiParam apiParam) { + this.apiParam = apiParam; + } + + @Override + public String getName() { + return apiParam.name(); + } + + @Override + public String getDescription() { + return apiParam.value(); + } + + @Override + public String getDefaultValue() { + return apiParam.defaultValue(); + } + + @Override + public String getAllowableValues() { + return apiParam.allowableValues(); + } + + @Override + public boolean isRequired() { + return apiParam.required(); + } + + @Override + public String getAccess() { + return apiParam.access(); + } + + @Override + public boolean isAllowMultiple() { + return apiParam.allowMultiple(); + } + + @Override + public String getDataType() { + return null; + } + + @Override + public String getParamType() { + return null; + } + + @Override + public ApiParam getAnnotation() { + return apiParam; + } + + @Override + public boolean isHidden() { + return apiParam.hidden(); + } + + @Override + public String getExample() { + return apiParam.example(); + } + + public Example getExamples() { + return apiParam.examples(); + } + + public String getType() { + return apiParam.type(); + } + + public String getFormat() { + return apiParam.format(); + } + + public boolean getReadOnly() { + return apiParam.readOnly(); + } + + public boolean getAllowEmptyValue() { + return apiParam.allowEmptyValue(); + } + + public String getCollectionFormat() { + return apiParam.collectionFormat(); + } + } + + /** + * Wrapper implementation for ApiImplicitParam annotation + */ + private static final class ApiImplicitParamWrapper implements ParameterProcessorAdapterJakarta.ParamWrapper { + + private final ApiImplicitParam apiParam; + + private ApiImplicitParamWrapper(ApiImplicitParam apiParam) { + this.apiParam = apiParam; + } + + @Override + public String getName() { + return apiParam.name(); + } + + @Override + public String getDescription() { + return apiParam.value(); + } + + @Override + public String getDefaultValue() { + return apiParam.defaultValue(); + } + + @Override + public String getAllowableValues() { + return apiParam.allowableValues(); + } + + @Override + public boolean isRequired() { + return apiParam.required(); + } + + @Override + public String getAccess() { + return apiParam.access(); + } + + @Override + public boolean isAllowMultiple() { + return apiParam.allowMultiple(); + } + + @Override + public String getDataType() { + return apiParam.dataType(); + } + + @Override + public String getParamType() { + return apiParam.paramType(); + } + + @Override + public ApiImplicitParam getAnnotation() { + return apiParam; + } + + @Override + public boolean isHidden() { + return false; + } + + @Override + public String getExample() { + return apiParam.example(); + } + + public Example getExamples() { + return apiParam.examples(); + } + + public String getType() { + return apiParam.type(); + } + + public String getFormat() { + return apiParam.format(); + } + + public boolean getReadOnly() { + return apiParam.readOnly(); + } + + public boolean getAllowEmptyValue() { + return apiParam.allowEmptyValue(); + } + + public String getCollectionFormat() { + return apiParam.collectionFormat(); + } + } +} diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/SwaggerAnnotationIntrospectorAdapterJakarta.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/SwaggerAnnotationIntrospectorAdapterJakarta.java new file mode 100644 index 00000000000..af0b484d471 --- /dev/null +++ b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/jakarta/SwaggerAnnotationIntrospectorAdapterJakarta.java @@ -0,0 +1,123 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.servicecomb.swagger.jakarta; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.AnnotationIntrospector; +import com.fasterxml.jackson.databind.introspect.Annotated; +import com.fasterxml.jackson.databind.introspect.AnnotatedClass; +import com.fasterxml.jackson.databind.introspect.AnnotatedMember; +import com.fasterxml.jackson.databind.jsontype.NamedType; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import io.swagger.jackson.PackageVersion; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import jakarta.xml.bind.annotation.XmlElement; + +/** + * replace io.swagger.jackson.SwaggerAnnotationIntrospector to adapter JAVAEE9 jakarta API + * modifying content: javax API dependency changing to the jakarta API dependency. + */ +public class SwaggerAnnotationIntrospectorAdapterJakarta extends AnnotationIntrospector { + private static final long serialVersionUID = 1L; + private boolean isThereAHiddenField = false; + + @Override + public Version version() { + return PackageVersion.VERSION; + } + + @Override + public boolean hasIgnoreMarker(AnnotatedMember m) { + ApiModelProperty ann = m.getAnnotation(ApiModelProperty.class); + if (ann != null && ann.hidden()) { + isThereAHiddenField = true; + return true; + } + // Add a Ignore Marker when there's a Constructor with JsonCreator and also if there's any Hidden Field + JsonCreator constructor = m.getAnnotation(JsonCreator.class); + if (constructor != null && isThereAHiddenField) { + return true; + } + return false; + } + + @Override + public Boolean hasRequiredMarker(AnnotatedMember m) { + ApiModelProperty ann = m.getAnnotation(ApiModelProperty.class); + if (ann != null) { + return ann.required(); + } + XmlElement elem = m.getAnnotation(XmlElement.class); + if (elem != null) { + if (elem.required()) { + return true; + } + } + return null; + } + + @Override + public String findPropertyDescription(Annotated a) { + ApiModel model = a.getAnnotation(ApiModel.class); + if (model != null && !"".equals(model.description())) { + return model.description(); + } + ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class); + if (prop != null) { + return prop.value(); + } + return null; + } + + @Override + public Integer findPropertyIndex(Annotated a) { + ApiModelProperty prop = a.getAnnotation(ApiModelProperty.class); + if (prop != null && prop.position() != 0) { + return prop.position(); + } + return null; + } + + @Override + public List findSubtypes(Annotated a) { + final ApiModel api = a.getAnnotation(ApiModel.class); + if (api != null) { + final Class[] classes = api.subTypes(); + final List names = new ArrayList(classes.length); + for (Class subType : classes) { + names.add(new NamedType(subType)); + } + if (!names.isEmpty()) { + return names; + } + } + + return Collections.emptyList(); + } + + @Override + public String findTypeName(AnnotatedClass ac) { + return null; + } +} diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java index d4058fdcb6c..48e4d4ec10e 100644 --- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java +++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/extend/property/creator/TestPartPropertyCreator.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.swagger.extend.property.creator; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java index 83b38039ee5..0795d9ef4a6 100644 --- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java +++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/TestClassUtils.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.SwaggerUtils; import org.apache.servicecomb.swagger.generator.SwaggerConst; diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java index 7cd73657c36..3539a13b702 100644 --- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java +++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiOperationProcessorTest.java @@ -19,10 +19,10 @@ import static org.hamcrest.Matchers.containsInAnyOrder; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; -import javax.validation.constraints.NotNull; -import javax.ws.rs.core.MediaType; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import jakarta.ws.rs.core.MediaType; import io.swagger.models.properties.Property; import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation; diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java index 468c8eb1e86..3b02812aa19 100644 --- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java +++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/ApiProcessorTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.Matchers.contains; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.swagger.generator.SwaggerGenerator; import org.apache.servicecomb.swagger.generator.core.model.SwaggerOperation; diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java index e424865b60c..ab95917c9f9 100644 --- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java +++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/processor/annotation/SwaggerDefinitionProcessorTest.java @@ -19,7 +19,7 @@ import static org.hamcrest.Matchers.contains; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.swagger.generator.SwaggerGenerator; import org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils; diff --git a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java index bb8c6836ad4..8a3288e8f0d 100644 --- a/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java +++ b/swagger/swagger-generator/generator-core/src/test/java/org/apache/servicecomb/swagger/generator/core/schema/Schema.java @@ -25,8 +25,8 @@ import java.util.Set; import java.util.concurrent.CompletableFuture; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.Part; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.test.scaffolding.model.Color; import org.apache.servicecomb.foundation.test.scaffolding.model.User; diff --git a/swagger/swagger-generator/generator-jaxrs/pom.xml b/swagger/swagger-generator/generator-jaxrs/pom.xml index 0ec649b44f0..5e49be5a580 100644 --- a/swagger/swagger-generator/generator-jaxrs/pom.xml +++ b/swagger/swagger-generator/generator-jaxrs/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger-generator - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-generator-jaxrs Java Chassis::Swagger::Generator::Jaxrs diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsOperationGenerator.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsOperationGenerator.java index b1f23c36813..6860b5c2841 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsOperationGenerator.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsOperationGenerator.java @@ -22,7 +22,7 @@ import java.util.List; import java.util.Map; -import javax.ws.rs.BeanParam; +import jakarta.ws.rs.BeanParam; import org.apache.servicecomb.swagger.generator.ParameterGenerator; import org.apache.servicecomb.swagger.generator.core.AbstractSwaggerGenerator; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGenerator.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGenerator.java index 4fb24c49654..6646941d3c8 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGenerator.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGenerator.java @@ -20,7 +20,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; import org.apache.servicecomb.swagger.generator.OperationGenerator; import org.apache.servicecomb.swagger.generator.rest.RestSwaggerGenerator; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorFactory.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorFactory.java index ac3460fa701..8c60a85671c 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorFactory.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/JaxrsSwaggerGeneratorFactory.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.SwaggerUtils; import org.apache.servicecomb.swagger.generator.SwaggerGenerator; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ConsumesAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ConsumesAnnotationProcessor.java index e1f77486015..784f223543b 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ConsumesAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ConsumesAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.Consumes; +import jakarta.ws.rs.Consumes; import org.apache.servicecomb.swagger.SwaggerUtils; import org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/CookieParamAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/CookieParamAnnotationProcessor.java index 271bbf25806..ad618ce1935 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/CookieParamAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/CookieParamAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.CookieParam; +import jakarta.ws.rs.CookieParam; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; import org.apache.servicecomb.swagger.generator.core.processor.parameter.AbstractSerializableParameterProcessor; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/DeleteAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/DeleteAnnotationProcessor.java index 3b6668b9986..e5cc735b1c1 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/DeleteAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/DeleteAnnotationProcessor.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.DELETE; +import jakarta.ws.rs.DELETE; public class DeleteAnnotationProcessor extends GetAnnotationProcessor { @Override diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/FormParamAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/FormParamAnnotationProcessor.java index 1e7bbf44ffb..9b4457b7f40 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/FormParamAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/FormParamAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.FormParam; +import jakarta.ws.rs.FormParam; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; import org.apache.servicecomb.swagger.generator.core.processor.parameter.AbstractSerializableParameterProcessor; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/GetAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/GetAnnotationProcessor.java index f474d410056..05885cddbe3 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/GetAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/GetAnnotationProcessor.java @@ -20,8 +20,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.GET; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HttpMethod; import org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor; import org.apache.servicecomb.swagger.generator.OperationGenerator; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/HeaderParamAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/HeaderParamAnnotationProcessor.java index 29bb657c804..59801705b6d 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/HeaderParamAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/HeaderParamAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.HeaderParam; +import jakarta.ws.rs.HeaderParam; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; import org.apache.servicecomb.swagger.generator.core.processor.parameter.AbstractSerializableParameterProcessor; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PatchAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PatchAnnotationProcessor.java index 435c1b55469..e2648cd026a 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PatchAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PatchAnnotationProcessor.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.PATCH; +import jakarta.ws.rs.PATCH; public class PatchAnnotationProcessor extends GetAnnotationProcessor { @Override diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathClassAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathClassAnnotationProcessor.java index f8e8a612185..15283a8e14a 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathClassAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathClassAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.generator.ClassAnnotationProcessor; import org.apache.servicecomb.swagger.generator.SwaggerGenerator; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathMethodAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathMethodAnnotationProcessor.java index 6860a6726a3..80931c20958 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathMethodAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathMethodAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor; import org.apache.servicecomb.swagger.generator.OperationGenerator; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathParamAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathParamAnnotationProcessor.java index c523e308ef2..cae8fe48bb3 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathParamAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PathParamAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.PathParam; +import jakarta.ws.rs.PathParam; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; import org.apache.servicecomb.swagger.generator.core.processor.parameter.AbstractSerializableParameterProcessor; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PostAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PostAnnotationProcessor.java index b449f29c597..da7fd0dc394 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PostAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PostAnnotationProcessor.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.POST; +import jakarta.ws.rs.POST; public class PostAnnotationProcessor extends GetAnnotationProcessor { @Override diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ProducesAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ProducesAnnotationProcessor.java index 33cddc591e6..16f320ea4ac 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ProducesAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/ProducesAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Produces; import org.apache.servicecomb.swagger.SwaggerUtils; import org.apache.servicecomb.swagger.generator.MethodAnnotationProcessor; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PutAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PutAnnotationProcessor.java index 38a453c39fe..3b0f5ecf482 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PutAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/PutAnnotationProcessor.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.PUT; +import jakarta.ws.rs.PUT; public class PutAnnotationProcessor extends GetAnnotationProcessor { @Override diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/QueryParamAnnotationProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/QueryParamAnnotationProcessor.java index ec78952120c..904841e6309 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/QueryParamAnnotationProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/annotation/QueryParamAnnotationProcessor.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; import org.apache.servicecomb.swagger.generator.core.model.HttpParameterType; import org.apache.servicecomb.swagger.generator.core.processor.parameter.AbstractSerializableParameterProcessor; diff --git a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/response/JaxrsResponseProcessor.java b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/response/JaxrsResponseProcessor.java index 715464d99a2..20a7b263662 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/response/JaxrsResponseProcessor.java +++ b/swagger/swagger-generator/generator-jaxrs/src/main/java/org/apache/servicecomb/swagger/generator/jaxrs/processor/response/JaxrsResponseProcessor.java @@ -19,8 +19,8 @@ import java.lang.reflect.Type; import java.util.List; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.servicecomb.swagger.generator.OperationGenerator; import org.apache.servicecomb.swagger.generator.SwaggerGenerator; diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/ClassMethodNoPath.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/ClassMethodNoPath.java index c8071550967..fc4d2358124 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/ClassMethodNoPath.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/ClassMethodNoPath.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("") public class ClassMethodNoPath { diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java index a0a10f832cb..46358f94586 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/Echo.java @@ -19,20 +19,20 @@ import java.util.List; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PATCH; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PATCH; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import org.apache.servicecomb.foundation.test.scaffolding.model.Color; import org.apache.servicecomb.foundation.test.scaffolding.model.User; diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/MultiDefaultPath.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/MultiDefaultPath.java index f8e743f9f59..ab18732e479 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/MultiDefaultPath.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/MultiDefaultPath.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; @Path("/abc") public class MultiDefaultPath { diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java index 4084f8781b6..d07a20d8935 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/TestJaxrs.java @@ -20,8 +20,6 @@ import org.apache.servicecomb.swagger.generator.core.unittest.UnitTestSwaggerUtils; import org.apache.servicecomb.swagger.generator.jaxrs.model.ConsumesAndProduces; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; -import org.junit.jupiter.api.condition.JRE; public class TestJaxrs { @Test @@ -51,7 +49,6 @@ public void testInvalidResponse() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void testEcho() { UnitTestSwaggerUtils.testSwagger("schemas/echo.yaml", Echo.class, "echo"); } @@ -67,7 +64,6 @@ public void testQuery() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void testQueryComplex() { UnitTestSwaggerUtils.testException( "generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:queryComplex.", @@ -116,27 +112,23 @@ public void consumesAndProduces() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void aggregatedParam() { UnitTestSwaggerUtils.testSwagger("schemas/aggregatedParam.yaml", Echo.class, "aggregatedParam"); } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void beanParamDefaultBody() { UnitTestSwaggerUtils .testSwagger("schemas/beanParamDefaultBody.yaml", Echo.class, "beanParamDefaultBody"); } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void beanParamWithJsonIgnoredTagged() { UnitTestSwaggerUtils .testSwagger("schemas/beanParamWithJsonIgnoredTagged.yaml", Echo.class, "beanParamWithJsonIgnoredTagged"); } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void beanParamWithPart() { UnitTestSwaggerUtils.testSwagger("schemas/beanParamWithPart.yaml", Echo.class, "beanParamWithPart"); } @@ -152,19 +144,16 @@ public void should_support_patch_http_method() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void should_support_dynamic_enum() { UnitTestSwaggerUtils.testSwagger("schemas/dynamicStatusEnum.yaml", Echo.class, "dynamicStatusEnum"); } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void should_support_jdk_enum() { UnitTestSwaggerUtils.testSwagger("schemas/jdkStatusEnum.yaml", Echo.class, "jdkStatusEnum"); } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void beanParamComplexField() { UnitTestSwaggerUtils.testException( "generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:beanParamComplexField.", @@ -175,7 +164,6 @@ public void beanParamComplexField() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void beanParamComplexSetter() { UnitTestSwaggerUtils.testException( "generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:beanParamComplexSetter.", @@ -186,7 +174,6 @@ public void beanParamComplexSetter() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void beanParamInvalidDefaultBody() { UnitTestSwaggerUtils.testException( "generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.jaxrs.Echo:beanParamInvalidDefaultBody.", diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/AggregatedParam.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/AggregatedParam.java index 16cc22eb12d..f4a5b6312d4 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/AggregatedParam.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/AggregatedParam.java @@ -18,12 +18,12 @@ import java.util.List; -import javax.ws.rs.CookieParam; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; public class AggregatedParam { @DefaultValue("pa") diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexField.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexField.java index c456994f1cd..db6eb377943 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexField.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexField.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs.model; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; public class BeanParamComplexField { @QueryParam("q") diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexSetter.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexSetter.java index 01ae73a34c1..c2c6b537a41 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexSetter.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamComplexSetter.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs.model; -import javax.ws.rs.HeaderParam; +import jakarta.ws.rs.HeaderParam; public class BeanParamComplexSetter { private AggregatedParam complex; diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithJsonIgnoredTagged.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithJsonIgnoredTagged.java index 532c8e2c8c6..5acea6d419e 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithJsonIgnoredTagged.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithJsonIgnoredTagged.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs.model; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; import com.fasterxml.jackson.annotation.JsonIgnore; diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithPart.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithPart.java index 93995d5ba02..85305b1a61b 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithPart.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/BeanParamWithPart.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs.model; -import javax.servlet.http.Part; -import javax.ws.rs.FormParam; -import javax.ws.rs.QueryParam; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.QueryParam; public class BeanParamWithPart { @QueryParam("queryStr") diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/ConsumesAndProduces.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/ConsumesAndProduces.java index 39da129addf..b39ea589b5d 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/ConsumesAndProduces.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/ConsumesAndProduces.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs.model; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; public class ConsumesAndProduces { @Consumes(MediaType.APPLICATION_JSON) diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/DynamicStatusBeanParam.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/DynamicStatusBeanParam.java index 8cd280c29b4..b6b5387074c 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/DynamicStatusBeanParam.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/DynamicStatusBeanParam.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs.model.enums; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; import io.swagger.annotations.ApiParam; diff --git a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/JdkStatusBeanParam.java b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/JdkStatusBeanParam.java index a6437c55583..e0e1be7288c 100644 --- a/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/JdkStatusBeanParam.java +++ b/swagger/swagger-generator/generator-jaxrs/src/test/java/org/apache/servicecomb/swagger/generator/jaxrs/model/enums/JdkStatusBeanParam.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.jaxrs.model.enums; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; import io.swagger.annotations.ApiParam; diff --git a/swagger/swagger-generator/generator-spring-data/pom.xml b/swagger/swagger-generator/generator-spring-data/pom.xml index d478e7c7619..5a76c578682 100644 --- a/swagger/swagger-generator/generator-spring-data/pom.xml +++ b/swagger/swagger-generator/generator-spring-data/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb swagger-generator - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/swagger/swagger-generator/generator-springmvc/pom.xml b/swagger/swagger-generator/generator-springmvc/pom.xml index 101e2004402..45cfb2de64b 100644 --- a/swagger/swagger-generator/generator-springmvc/pom.xml +++ b/swagger/swagger-generator/generator-springmvc/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger-generator - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-generator-springmvc Java Chassis::Swagger::Generator::Spring MVC diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java index 47b10ecec34..7b129894db2 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/TestSpringmvc.java @@ -23,8 +23,6 @@ import org.apache.servicecomb.swagger.generator.springmvc.model.SwaggerTestTarget_ValueOverWritePath; import org.apache.servicecomb.swagger.generator.springmvc.model.TestProducer; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.condition.EnabledForJreRange; -import org.junit.jupiter.api.condition.JRE; public class TestSpringmvc { @Test @@ -35,7 +33,6 @@ public void testMultiDefaultPath() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void testResponseEntity() { UnitTestSwaggerUtils.testSwagger("schemas/responseEntity.yaml", MethodResponseEntity.class); } @@ -47,7 +44,6 @@ public void testEmptyPath() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void testMixupAnnotations() { UnitTestSwaggerUtils.testSwagger("schemas/mixupAnnotations.yaml", MethodMixupAnnotations.class); } @@ -175,13 +171,11 @@ public void testSimpleParam() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void testObjectParam() { UnitTestSwaggerUtils.testSwagger("schemas/testObjectParam.yaml", DefaultParameterSchema.class, "testObjectParam"); } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void testMultiObjParamsWithSameFiledName() { UnitTestSwaggerUtils.testException( "generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema:testMultiObjParamsWithSameFiledName.", @@ -191,7 +185,6 @@ public void testMultiObjParamsWithSameFiledName() { } @Test - @EnabledForJreRange(min = JRE.JAVA_8, max = JRE.JAVA_11) public void testUnsupportedParamType() { UnitTestSwaggerUtils.testException( "generate swagger operation failed, method=org.apache.servicecomb.swagger.generator.springmvc.model.DefaultParameterSchema:testUnsupportedParamType.", diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/SwaggerTestTarget.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/SwaggerTestTarget.java index 29565c72e8a..1eb7d967835 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/SwaggerTestTarget.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/SwaggerTestTarget.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.springmvc.model; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/TestProducer.java b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/TestProducer.java index 1e2cc39a769..3dcfee2026e 100644 --- a/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/TestProducer.java +++ b/swagger/swagger-generator/generator-springmvc/src/test/java/org/apache/servicecomb/swagger/generator/springmvc/model/TestProducer.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.generator.springmvc.model; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; diff --git a/swagger/swagger-generator/pom.xml b/swagger/swagger-generator/pom.xml index 1467e6f9caf..323c3c779eb 100644 --- a/swagger/swagger-generator/pom.xml +++ b/swagger/swagger-generator/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-generator Java Chassis::Swagger::Generator diff --git a/swagger/swagger-invocation/invocation-core/pom.xml b/swagger/swagger-invocation/invocation-core/pom.xml index 52609c4a529..1680a004422 100644 --- a/swagger/swagger-invocation/invocation-core/pom.xml +++ b/swagger/swagger-invocation/invocation-core/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger-invocation - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-invocation-core Java Chassis::Swagger::Invocation::Core diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/AsyncResponse.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/AsyncResponse.java index e8b8895898c..0e0bffa24cb 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/AsyncResponse.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/AsyncResponse.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.swagger.invocation; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; public interface AsyncResponse { void handle(Response response); diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/Response.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/Response.java index 5b696db2c1e..26cfb48d322 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/Response.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/Response.java @@ -18,8 +18,8 @@ import java.util.List; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.context.HttpStatus; import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java index 9789752bd48..8f7da8d0bd3 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/context/InvocationContext.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; /** * InvocationContext is used to pass data between microservices or in microservice different layer. diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/BytesToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/BytesToPartConverter.java index 4be57ebd02e..affccb1e104 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/BytesToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/BytesToPartConverter.java @@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream; import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.InputStreamPart; import org.apache.servicecomb.swagger.invocation.converter.Converter; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/FileToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/FileToPartConverter.java index 9261f678fa1..66964377cbb 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/FileToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/FileToPartConverter.java @@ -20,7 +20,7 @@ import java.io.File; import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.FilePart; import org.apache.servicecomb.swagger.invocation.converter.Converter; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/InputStreamToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/InputStreamToPartConverter.java index 06faa72b9c7..81216cadda0 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/InputStreamToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/InputStreamToPartConverter.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.InputStreamPart; import org.apache.servicecomb.swagger.invocation.converter.Converter; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverter.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverter.java index 50f58197e77..afceb32e250 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverter.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; import java.util.List; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.swagger.invocation.converter.Converter; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverter.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverter.java index add08a6b46c..cc2dbee4de9 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverter.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; import java.util.List; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.swagger.invocation.converter.Converter; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverter.java index c61997b8cb0..912f18852c7 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverter.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.swagger.invocation.converter.Converter; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/ResourceToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/ResourceToPartConverter.java index ca5384bbd87..d85d1bf64c0 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/ResourceToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/ResourceToPartConverter.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.ResourcePart; import org.apache.servicecomb.swagger.invocation.converter.Converter; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java index 8f9c37b567f..04245a279ff 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/ExceptionFactory.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletionException; import java.util.concurrent.ExecutionException; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationException.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationException.java index 425f61b2336..bd6ba5cc194 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationException.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/exception/InvocationException.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.swagger.invocation.exception; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.context.HttpStatus; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponsesMeta.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponsesMeta.java index 4499e2beeb1..1b06c1d8ad3 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponsesMeta.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponsesMeta.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils; import org.apache.servicecomb.swagger.converter.ConverterMgr; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapper.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapper.java index aa4f2ce8863..aa12dad9be9 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapper.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.response.producer; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapper.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapper.java index afc6c5e9d7e..1e63a537140 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapper.java @@ -18,7 +18,7 @@ import java.util.Optional; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/ProducerResponseMapper.java b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/ProducerResponseMapper.java index 4347d8b45ba..68617b87c1d 100644 --- a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/ProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/ProducerResponseMapper.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.response.producer; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java index c5849138560..743b77f8acd 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestException.java @@ -18,7 +18,7 @@ import java.lang.reflect.InvocationTargetException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.exception.CommonExceptionData; import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java index d06d3be353f..6c108e33cde 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/core/TestResponse.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.core; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace; import org.apache.servicecomb.swagger.invocation.AsyncResponse; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java index 6f3244d2f44..b52a3054056 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/context/TestInvocationContext.java @@ -19,7 +19,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.Response.Status.Family; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java index d985f96818b..908d6ece56a 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartArrayConverterTest.java @@ -18,7 +18,7 @@ import java.util.Arrays; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.FilePart; import org.hamcrest.MatcherAssert; @@ -31,7 +31,7 @@ public class PartListToPartArrayConverterTest { @Test public void getSrcType() { - Assertions.assertEquals("java.util.List", converter.getSrcType().getTypeName()); + Assertions.assertEquals("java.util.List", converter.getSrcType().getTypeName()); } @Test diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java index 9b5111ae2e3..33f96ba9e25 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartListToPartListConverterTest.java @@ -19,7 +19,7 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.FilePart; import org.junit.jupiter.api.Assertions; @@ -30,12 +30,12 @@ public class PartListToPartListConverterTest { @Test public void getSrcType() { - Assertions.assertEquals("java.util.List", converter.getSrcType().getTypeName()); + Assertions.assertEquals("java.util.List", converter.getSrcType().getTypeName()); } @Test public void getTargetType() { - Assertions.assertEquals("java.util.List", converter.getTargetType().getTypeName()); + Assertions.assertEquals("java.util.List", converter.getTargetType().getTypeName()); } @Test diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java index 13125dbb981..02e20c5f94a 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/PartToPartConverterTest.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.converter.impl.part; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.part.FilePart; import org.junit.Test; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java index 03d6d6ad9ea..409e53e2d3c 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestBytesToPartConverter.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.converter.impl.part; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java index 527e933dd31..38b2378ab59 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestFileToPartConverter.java @@ -19,7 +19,7 @@ import java.io.File; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java index 9e2021ef9ef..a846900eeb2 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestInputStreamToPartConverter.java @@ -20,7 +20,7 @@ import java.io.ByteArrayInputStream; import java.io.InputStream; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java index 67cf8e4a94f..20dd2a757ee 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/converter/impl/part/TestResourceToPartConverter.java @@ -19,7 +19,7 @@ import java.io.ByteArrayInputStream; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToProducerResponseConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToProducerResponseConverter.java index 87eaae408a5..490f5d498b5 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToProducerResponseConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/ErrorToProducerResponseConverter.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.exception; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToProducerResponseConverters.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToProducerResponseConverters.java index 2747148e07a..6bb8196608b 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToProducerResponseConverters.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestDefaultExceptionToProducerResponseConverters.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.Arrays; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java index f6ac2a8124d..ee933222dfd 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestExceptionFactory.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.exception; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.junit.Test; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToProducerResponseConverter.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToProducerResponseConverter.java index 159c2b2237f..f8ffed8b6bb 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToProducerResponseConverter.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/exception/TestInvocationExceptionToProducerResponseConverter.java @@ -33,7 +33,7 @@ public void getExceptionClass() { @Test public void convert(@Mocked SwaggerInvocation swaggerInvocation) { - InvocationException e = new InvocationException(javax.ws.rs.core.Response.Status.BAD_REQUEST, "test"); + InvocationException e = new InvocationException(jakarta.ws.rs.core.Response.Status.BAD_REQUEST, "test"); Response response = converter.convert(swaggerInvocation, e); Assertions.assertSame(e, response.getResult()); } diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/models/JaxrsImpl.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/models/JaxrsImpl.java index 21797d9f6ce..c1e9bd23f7b 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/models/JaxrsImpl.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/models/JaxrsImpl.java @@ -20,16 +20,16 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.swagger.invocation.context.InvocationContext; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java index c5004c090f6..1cf9a19b31f 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java @@ -43,7 +43,7 @@ interface ConsumerResponseForTest { Response scbResponse(); @ApiResponse(code = 200, message = "", response = String.class) - javax.ws.rs.core.Response jaxrsResponse(); + jakarta.ws.rs.core.Response jaxrsResponse(); Optional optional(); } diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactorys.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactorys.java index d06a541d38d..fdb0cc40d4c 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactorys.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactorys.java @@ -22,7 +22,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.engine.SwaggerEnvironment; import org.apache.servicecomb.swagger.engine.SwaggerProducer; @@ -51,8 +51,8 @@ public Response scbResponse() { } @ApiResponse(code = 200, message = "", response = String.class) - public javax.ws.rs.core.Response jaxrsResponse() { - return javax.ws.rs.core.Response.ok("jaxrs").build(); + public jakarta.ws.rs.core.Response jaxrsResponse() { + return jakarta.ws.rs.core.Response.ok("jaxrs").build(); } public Optional optional() { diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV1.java index 88ac9815a3c..440fa289a98 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV1.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV1.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.swagger.invocation.schemas; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.invocation.schemas.models.AddBeanParamV1; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV2.java index d5d6b5b3548..94a677a276e 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV2.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBeanParamV2.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.swagger.invocation.schemas; -import javax.ws.rs.BeanParam; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.invocation.schemas.models.AddBeanParamV2; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV1.java index 0b4f5e255e2..274f3846bed 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV1.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV1.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.swagger.invocation.schemas; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV1; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV2.java index ca18a94b03a..a1dc40c9b57 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV2.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddBodyV2.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.swagger.invocation.schemas; -import javax.ws.rs.POST; -import javax.ws.rs.Path; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.apache.servicecomb.swagger.invocation.schemas.models.AddWrapperV2; diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV1.java index 7db891d04be..4051f5551c4 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV1.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV1.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.swagger.invocation.schemas; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/") public class JaxrsAddV1 { diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV2.java index 284fe8d2aa8..661dd749113 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV2.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/JaxrsAddV2.java @@ -16,10 +16,10 @@ */ package org.apache.servicecomb.swagger.invocation.schemas; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/") public interface JaxrsAddV2 { diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV1.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV1.java index cf7ac00afb2..130e00ba79a 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV1.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV1.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.schemas.models; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; public class AddBeanParamV1 { @QueryParam("x") diff --git a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV2.java b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV2.java index 6b4dc2074b1..42d64834631 100644 --- a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV2.java +++ b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/models/AddBeanParamV2.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.swagger.invocation.schemas.models; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; public class AddBeanParamV2 { @QueryParam("x") diff --git a/swagger/swagger-invocation/invocation-jaxrs/pom.xml b/swagger/swagger-invocation/invocation-jaxrs/pom.xml index e64aba897d5..f463b67f305 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/pom.xml +++ b/swagger/swagger-invocation/invocation-jaxrs/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger-invocation - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-invocation-jaxrs Java Chassis::Swagger::Invocation::JAXRS diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapper.java index e11638aa091..549f4fc7151 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapper.java @@ -18,7 +18,7 @@ import java.util.Map.Entry; -import javax.ws.rs.core.Response.ResponseBuilder; +import jakarta.ws.rs.core.Response.ResponseBuilder; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapper; @@ -29,7 +29,7 @@ public class JaxrsConsumerResponseMapper implements ConsumerResponseMapper { @Override public Object mapResponse(Response response) { ResponseBuilder responseBuilder = - javax.ws.rs.core.Response.status(response.getStatus()).entity(response.getResult()); + jakarta.ws.rs.core.Response.status(response.getStatus()).entity(response.getResult()); MultiMap headers = response.getHeaders(); if (headers == null) { diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java index c0b0b6b53a9..241decec275 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys; import org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapper; diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapper.java index 4bc3afbf4d2..e1625da79d0 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapper.java @@ -19,8 +19,8 @@ import java.util.List; import java.util.Map.Entry; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapper; @@ -28,7 +28,7 @@ public class JaxrsProducerResponseMapper implements ProducerResponseMapper { @Override public Response mapResponse(StatusType status, Object response) { - javax.ws.rs.core.Response jaxrsResponse = (javax.ws.rs.core.Response) response; + jakarta.ws.rs.core.Response jaxrsResponse = (jakarta.ws.rs.core.Response) response; Response cseResponse = Response.status(jaxrsResponse.getStatusInfo()).entity(jaxrsResponse.getEntity()); MultivaluedMap headers = jaxrsResponse.getHeaders(); diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java index 7afbdcdde1d..e36e49407d2 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java @@ -18,7 +18,7 @@ import java.lang.reflect.Type; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys; import org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapper; diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java index 1112cb8abc9..85ac403e0ae 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsConsumerResponseMapper.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.swagger.invocation.jaxrs.response; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.core.Response; import org.apache.servicecomb.swagger.engine.SwaggerConsumer; import org.apache.servicecomb.swagger.engine.SwaggerConsumerOperation; @@ -39,7 +39,7 @@ interface ConsumerResponseForTest { @ApiResponse(code = 200, message = "", response = String.class) @Path("/jaxrsResponse") @GET - javax.ws.rs.core.Response jaxrsResponse(); + jakarta.ws.rs.core.Response jaxrsResponse(); } SwaggerEnvironment environment = new SwaggerEnvironment(); diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java index 3f7dcb72b42..6b60db54852 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapper.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.swagger.invocation.jaxrs.response; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.hamcrest.MatcherAssert; @@ -33,7 +33,7 @@ public class TestJaxrsProducerResponseMapper { @Test public void mapResponse_withoutHeaders() { - javax.ws.rs.core.Response jaxrsResponse = Mockito.mock(javax.ws.rs.core.Response.class); + jakarta.ws.rs.core.Response jaxrsResponse = Mockito.mock(jakarta.ws.rs.core.Response.class); Mockito.when(jaxrsResponse.getStatusInfo()).thenReturn(Status.OK); Mockito.when(jaxrsResponse.getEntity()).thenReturn("result"); Mockito.when(jaxrsResponse.getHeaders()).thenReturn(new MultivaluedHashMap<>()); @@ -46,7 +46,7 @@ public void mapResponse_withoutHeaders() { @Test public void mapResponse_withHeaders() { - javax.ws.rs.core.Response jaxrsResponse = Mockito.mock(javax.ws.rs.core.Response.class); + jakarta.ws.rs.core.Response jaxrsResponse = Mockito.mock(jakarta.ws.rs.core.Response.class); Mockito.when(jaxrsResponse.getStatusInfo()).thenReturn(Status.OK); Mockito.when(jaxrsResponse.getEntity()).thenReturn("result"); diff --git a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java index 8a1acf91374..0a72f648b27 100644 --- a/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java +++ b/swagger/swagger-invocation/invocation-jaxrs/src/test/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/TestJaxrsProducerResponseMapperFactory.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.swagger.invocation.jaxrs.response; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Response; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; diff --git a/swagger/swagger-invocation/invocation-springmvc/pom.xml b/swagger/swagger-invocation/invocation-springmvc/pom.xml index b7d89df3e8c..609ecb4a273 100644 --- a/swagger/swagger-invocation/invocation-springmvc/pom.xml +++ b/swagger/swagger-invocation/invocation-springmvc/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger-invocation - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-invocation-springmvc Java Chassis::Swagger::Invocation::Spring MVC @@ -32,6 +32,11 @@ org.apache.servicecomb swagger-invocation-core + + org.apache.servicecomb + swagger-generator-springmvc + test + com.google.inject guice diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartArrayConverter.java b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartArrayConverter.java index ecb683263a7..cab3ec53c6c 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartArrayConverter.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartArrayConverter.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; import java.util.List; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.springframework.web.multipart.MultipartFile; diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartListConverter.java b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartListConverter.java index b3b85e9f6d5..e1cba13b008 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartListConverter.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartListToMultipartListConverter.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.springframework.web.multipart.MultipartFile; diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartConverter.java b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartConverter.java index a7ecf6523ec..ea65af5b121 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartConverter.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartConverter.java @@ -19,7 +19,7 @@ import java.lang.reflect.Type; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.springframework.web.multipart.MultipartFile; diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartFile.java b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartFile.java index ab065bb7bdd..8dd03dd3c86 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartFile.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/converter/PartToMultipartFile.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.InputStream; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.commons.io.IOUtils; import org.springframework.web.multipart.MultipartFile; diff --git a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapper.java b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapper.java index 2ce126329ed..1337f8673ae 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapper.java @@ -19,7 +19,7 @@ import java.util.List; import java.util.Map.Entry; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.context.HttpStatus; @@ -39,8 +39,7 @@ public SpringmvcProducerResponseMapper(ProducerResponseMapper realMapper) { public Response mapResponse(StatusType status, Object response) { ResponseEntity springmvcResponse = (ResponseEntity) response; - StatusType responseStatus = new HttpStatus(springmvcResponse.getStatusCode().value(), - springmvcResponse.getStatusCode().getReasonPhrase()); + StatusType responseStatus = new HttpStatus(springmvcResponse.getStatusCode().value(), ""); Response cseResponse = null; if (HttpStatus.isSuccess(responseStatus)) { diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java index e0e3cf45862..7bf2bda9836 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/converter/TestPartToMultipartFile.java @@ -21,7 +21,7 @@ import java.io.File; import java.io.IOException; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.Holder; import org.junit.Before; diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java index 71981bb23fa..df8c6d65957 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcConsumerResponseMapper.java @@ -25,9 +25,9 @@ import org.apache.servicecomb.swagger.invocation.Response; import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; -import org.junit.Before; -import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import org.springframework.http.ResponseEntity; import io.swagger.models.Swagger; @@ -39,16 +39,16 @@ interface ConsumerResponseForTest { CompletableFuture> asyncResponseEntity(); } - SwaggerEnvironment environment = new SwaggerEnvironment(); + static SwaggerEnvironment environment = new SwaggerEnvironment(); - SwaggerConsumer swaggerConsumer; + static SwaggerConsumer swaggerConsumer; String result = "abc"; Response response = Response.ok(result); - @Before - public void setup() { + @BeforeAll + public static void setup() { Swagger swagger = SwaggerGenerator.generate(ConsumerResponseForTest.class); swaggerConsumer = environment.createConsumer(ConsumerResponseForTest.class, swagger); } diff --git a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java index 15d6ec42f36..cc029356aa1 100644 --- a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java +++ b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapper.java @@ -19,8 +19,8 @@ import java.util.Arrays; import java.util.List; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.StatusType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.StatusType; import org.apache.servicecomb.foundation.common.http.HttpStatus; import org.apache.servicecomb.swagger.invocation.Response; diff --git a/swagger/swagger-invocation/invocation-validator/pom.xml b/swagger/swagger-invocation/invocation-validator/pom.xml index cb5acfc6288..9e32b2f28c9 100644 --- a/swagger/swagger-invocation/invocation-validator/pom.xml +++ b/swagger/swagger-invocation/invocation-validator/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger-invocation - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-invocation-validator Java Chassis::Swagger::Invocation::Validator diff --git a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToProducerResponseConverter.java b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToProducerResponseConverter.java index 58e3e4e0cfc..552c97000ba 100644 --- a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToProducerResponseConverter.java +++ b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ConstraintViolationExceptionToProducerResponseConverter.java @@ -16,8 +16,8 @@ */ package org.apache.servicecomb.swagger.invocation.validator; -import javax.validation.ConstraintViolationException; -import javax.ws.rs.core.Response.Status; +import jakarta.validation.ConstraintViolationException; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.swagger.invocation.Response; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/DefaultParameterNameProvider.java b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/DefaultParameterNameProvider.java index 09f78b2b0a9..e1a30725b45 100644 --- a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/DefaultParameterNameProvider.java +++ b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/DefaultParameterNameProvider.java @@ -26,7 +26,7 @@ import java.util.List; import java.util.Map; -import javax.validation.ParameterNameProvider; +import jakarta.validation.ParameterNameProvider; import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx; diff --git a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java index 22823df75ba..fd037ced4a9 100644 --- a/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java +++ b/swagger/swagger-invocation/invocation-validator/src/main/java/org/apache/servicecomb/swagger/invocation/validator/ParameterValidator.java @@ -19,13 +19,13 @@ import java.util.Map; import java.util.Set; -import javax.validation.Configuration; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import javax.validation.Validation; -import javax.validation.ValidatorFactory; -import javax.validation.executable.ExecutableValidator; -import javax.validation.groups.Default; +import jakarta.validation.Configuration; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; +import jakarta.validation.Validation; +import jakarta.validation.ValidatorFactory; +import jakarta.validation.executable.ExecutableValidator; +import jakarta.validation.groups.Default; import org.apache.servicecomb.swagger.engine.SwaggerProducerOperation; import org.apache.servicecomb.swagger.invocation.SwaggerInvocation; diff --git a/swagger/swagger-invocation/pom.xml b/swagger/swagger-invocation/pom.xml index ae77be37f53..4824a97feb0 100644 --- a/swagger/swagger-invocation/pom.xml +++ b/swagger/swagger-invocation/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb swagger - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT swagger-invocation Java Chassis::Swagger::Invocation diff --git a/tracing/pom.xml b/tracing/pom.xml index df5b887b032..e4dfa13bb11 100644 --- a/tracing/pom.xml +++ b/tracing/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default 4.0.0 @@ -39,6 +39,12 @@ org.springframework.boot spring-boot-starter-aop + + + org.springframework.boot + spring-boot-starter-logging + + diff --git a/tracing/tracing-common/pom.xml b/tracing/tracing-common/pom.xml index 73bb334314b..a079c7153e5 100644 --- a/tracing/tracing-common/pom.xml +++ b/tracing/tracing-common/pom.xml @@ -22,7 +22,7 @@ tracing org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/tracing/tracing-zipkin/pom.xml b/tracing/tracing-zipkin/pom.xml index b3e538a2d3a..ac85183d9f5 100644 --- a/tracing/tracing-zipkin/pom.xml +++ b/tracing/tracing-zipkin/pom.xml @@ -22,7 +22,7 @@ tracing org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 @@ -50,10 +50,28 @@ io.zipkin.brave brave-context-slf4j + + io.zipkin.reporter2 + zipkin-reporter-brave + + + io.zipkin.zipkin2 + zipkin + + + org.slf4j + slf4j-api + org.springframework.boot spring-boot-starter-test + + + org.springframework.boot + spring-boot-starter-logging + + test diff --git a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java index acccdc3fbce..19970909bbe 100644 --- a/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java +++ b/tracing/tracing-zipkin/src/test/java/org/apache/servicecomb/tracing/zipkin/ZipkinSpanAspectTest.java @@ -34,14 +34,12 @@ import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.CustomSpanTask; import org.apache.servicecomb.tracing.zipkin.app.ZipkinSpanTestApplication.SomeSlowTask; import org.hamcrest.MatcherAssert; -import org.junit.After; -import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.test.context.junit4.SpringRunner; import brave.Tracing; import brave.propagation.StrictScopeDecorator; @@ -49,7 +47,6 @@ import zipkin2.Span; import zipkin2.reporter.brave.ZipkinSpanHandler; -@RunWith(SpringRunner.class) @SpringBootTest(classes = {ZipkinSpanTestApplication.class, TracingConfig.class}) public class ZipkinSpanAspectTest { private Queue spans; @@ -83,7 +80,7 @@ public void setTracing(Tracing tracing) { public ZipkinSpanAspectTest() { } - @After + @AfterEach public void tearDown() throws Exception { tracing.close(); } diff --git a/transports/pom.xml b/transports/pom.xml index 3c3887ae986..9da4b501c51 100644 --- a/transports/pom.xml +++ b/transports/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb java-chassis-parent - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT ../parents/default transports diff --git a/transports/transport-common/pom.xml b/transports/transport-common/pom.xml index ad199553c4f..298ad69ce59 100644 --- a/transports/transport-common/pom.xml +++ b/transports/transport-common/pom.xml @@ -21,7 +21,7 @@ transports org.apache.servicecomb - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT 4.0.0 diff --git a/transports/transport-highway/pom.xml b/transports/transport-highway/pom.xml index 9db6c7d8b02..af8cf99c2ca 100644 --- a/transports/transport-highway/pom.xml +++ b/transports/transport-highway/pom.xml @@ -21,7 +21,7 @@ org.apache.servicecomb transports - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT transport-highway Java Chassis::Transports::Hightway diff --git a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClient.java b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClient.java index 1493fea1b7f..1579475c0ed 100644 --- a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClient.java +++ b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClient.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.TimeoutException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import com.google.common.annotations.VisibleForTesting; import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf; diff --git a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClientFilter.java b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClientFilter.java index 77d17a44951..14c12a630d0 100644 --- a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClientFilter.java +++ b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClientFilter.java @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf; import org.apache.servicecomb.codec.protobuf.definition.ProtobufManager; diff --git a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilter.java b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilter.java index 01870a3f333..10167be9a65 100644 --- a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilter.java +++ b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilter.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf; import org.apache.servicecomb.codec.protobuf.definition.ResponseRootSerializer; diff --git a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerConnection.java b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerConnection.java index a646f7af0d4..2bc71ff4cbb 100644 --- a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerConnection.java +++ b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerConnection.java @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.codec.protobuf.definition.ProtobufManager; import org.apache.servicecomb.core.Const; diff --git a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java index 1149325a03a..98fab636217 100644 --- a/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java +++ b/transports/transport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayServerInvoke.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.RejectedExecutionException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf; import org.apache.servicecomb.codec.protobuf.definition.ProtobufManager; diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java index 7539e13860b..5ec1142f559 100644 --- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java +++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/HighwayServerCodecFilterTest.java @@ -17,7 +17,7 @@ package org.apache.servicecomb.transport.highway; -import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR; import static org.assertj.core.api.Assertions.assertThat; import java.util.concurrent.CompletableFuture; diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java index 43db6143352..227f7135118 100644 --- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java +++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java @@ -20,7 +20,7 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf; import org.apache.servicecomb.codec.protobuf.definition.ProtobufManager; diff --git a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java index 9de05d4c49e..622f0a743bd 100644 --- a/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java +++ b/transports/transport-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayCodec.java @@ -89,7 +89,7 @@ public void setUp() { lByteBuf = Mockito.mock(ByteBuf.class); - nioBuffer = Mockito.mock(ByteBuffer.class); + nioBuffer = ByteBuffer.allocate(0); invocation = Mockito.mock(Invocation.class); } diff --git a/transports/transport-rest/pom.xml b/transports/transport-rest/pom.xml index a27272d4e56..cb93792adde 100644 --- a/transports/transport-rest/pom.xml +++ b/transports/transport-rest/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb transports - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT transport-rest Java Chassis::Transports::Rest diff --git a/transports/transport-rest/transport-rest-client/pom.xml b/transports/transport-rest/transport-rest-client/pom.xml index edf864b051f..0a22aaf8c80 100644 --- a/transports/transport-rest/transport-rest-client/pom.xml +++ b/transports/transport-rest/transport-rest-client/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb transport-rest - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT transport-rest-client Java Chassis::Transports::Rest::Client diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilter.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilter.java index 2cf13cbad86..8b94bcf6952 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilter.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientCodecFilter.java @@ -20,7 +20,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.core.Invocation; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientDecoder.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientDecoder.java index 4bc2c97b57d..89ef5581481 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientDecoder.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientDecoder.java @@ -19,7 +19,7 @@ import static org.apache.servicecomb.transport.rest.client.RestClientExceptionCodes.FAILED_TO_DECODE_REST_FAIL_RESPONSE; import static org.apache.servicecomb.transport.rest.client.RestClientExceptionCodes.FAILED_TO_DECODE_REST_SUCCESS_RESPONSE; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessorManager; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientEncoder.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientEncoder.java index d11171dc010..2e8f2f4ad06 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientEncoder.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientEncoder.java @@ -16,9 +16,9 @@ */ package org.apache.servicecomb.transport.rest.client; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.MULTIPART_FORM_DATA; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.apache.servicecomb.transport.rest.client.RestClientExceptionCodes.FAILED_TO_ENCODE_REST_CLIENT_REQUEST; import java.net.URLEncoder; @@ -26,11 +26,11 @@ import java.util.Map; import java.util.Map.Entry; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import javax.servlet.http.Part; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import jakarta.servlet.http.Part; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.codec.RestCodec; import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParameters.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParameters.java index 964cf5faa24..5031250b51f 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParameters.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParameters.java @@ -18,7 +18,7 @@ import java.util.Map; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.common.rest.codec.RestClientRequest; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParametersImpl.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParametersImpl.java index 75da6ded4b0..89faebb608d 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParametersImpl.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientRequestParametersImpl.java @@ -20,8 +20,8 @@ import java.util.HashMap; import java.util.Map; -import javax.annotation.Nonnull; -import javax.servlet.http.Part; +import jakarta.annotation.Nonnull; +import jakarta.servlet.http.Part; import org.apache.servicecomb.foundation.common.utils.PartUtils; import org.slf4j.Logger; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java index 6816d24ec14..977cbc10436 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSender.java @@ -22,7 +22,7 @@ import java.util.Map.Entry; import java.util.concurrent.CompletableFuture; -import javax.servlet.http.Part; +import jakarta.servlet.http.Part; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.invocation.InvocationStageTrace; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSenderFilter.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSenderFilter.java index 84e8baaa1bb..9392716fa88 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSenderFilter.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientSenderFilter.java @@ -18,7 +18,7 @@ import java.util.concurrent.CompletableFuture; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.core.Invocation; import org.apache.servicecomb.core.filter.ConsumerFilter; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactory.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactory.java index 07d823efb65..16e995f1aef 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactory.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/RestClientTransportContextFactory.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.transport.rest.client; -import static javax.ws.rs.core.Response.Status.BAD_REQUEST; +import static jakarta.ws.rs.core.Response.Status.BAD_REQUEST; import static org.apache.servicecomb.transport.rest.client.RestClientExceptionCodes.FAILED_TO_CREATE_REST_CLIENT_TRANSPORT_CONTEXT; import org.apache.commons.lang3.StringUtils; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java index c8cc79e0fa9..af5ee1d10b9 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/DefaultHttpClientFilter.java @@ -20,7 +20,7 @@ import java.util.Collection; import java.util.concurrent.CompletableFuture; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java index ded7b6e2ccf..f749f1173d0 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/http/RestClientInvocation.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.RestConst; diff --git a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/ws/WebSocketClientInvocation.java b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/ws/WebSocketClientInvocation.java index 375110b84d9..0702bd2661a 100644 --- a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/ws/WebSocketClientInvocation.java +++ b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/ws/WebSocketClientInvocation.java @@ -21,7 +21,7 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.TimeoutException; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.RestConst; diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestFeatureController.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestFeatureController.java index 1b567d7cf2e..88127270084 100644 --- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestFeatureController.java +++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/RestFeatureController.java @@ -19,13 +19,13 @@ import java.io.File; import java.util.List; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; @Path("/") public class RestFeatureController { diff --git a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java index d93de48b4b6..5c0b891e4a2 100644 --- a/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java +++ b/transports/transport-rest/transport-rest-client/src/test/java/org/apache/servicecomb/transport/rest/client/http/TestDefaultHttpClientFilter.java @@ -22,8 +22,8 @@ import java.util.HashMap; import java.util.Map; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.common.rest.codec.produce.ProduceJsonProcessor; @@ -160,7 +160,7 @@ ProduceProcessor findProduceProcessor(RestOperationMeta restOperation, HttpServl invocationException.getMessage()); Assertions.assertEquals( "Unrecognized token 'abc': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" - + " at [Source: (org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1, column: 4]", + + " at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); line: 1, column: 4]", invocationException.getCause().getMessage()); Assertions.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass()); CommonExceptionData commonExceptionData = (CommonExceptionData) invocationException.getErrorData(); @@ -208,7 +208,7 @@ ProduceProcessor findProduceProcessor(RestOperationMeta restOperation, HttpServl invocationException.getMessage()); Assertions.assertEquals( "Unrecognized token 'abc': was expecting (JSON String, Number, Array, Object or token 'null', 'true' or 'false')\n" - + " at [Source: (org.apache.servicecomb.foundation.vertx.stream.BufferInputStream); line: 1, column: 4]", + + " at [Source: REDACTED (`StreamReadFeature.INCLUDE_SOURCE_IN_LOCATION` disabled); line: 1, column: 4]", invocationException.getCause().getMessage()); Assertions.assertEquals(CommonExceptionData.class, invocationException.getErrorData().getClass()); CommonExceptionData commonExceptionData = (CommonExceptionData) invocationException.getErrorData(); diff --git a/transports/transport-rest/transport-rest-servlet/pom.xml b/transports/transport-rest/transport-rest-servlet/pom.xml index f08d0d8ff8a..6b0c7a52430 100644 --- a/transports/transport-rest/transport-rest-servlet/pom.xml +++ b/transports/transport-rest/transport-rest-servlet/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb transport-rest - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT transport-rest-servlet Java Chassis::Transports::Rest::Servlet diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/CseXmlWebApplicationContext.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/CseXmlWebApplicationContext.java index f8831deb6cc..f070ba87a8f 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/CseXmlWebApplicationContext.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/CseXmlWebApplicationContext.java @@ -21,7 +21,7 @@ import java.util.LinkedHashSet; import java.util.Set; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.foundation.common.utils.BeanUtils; diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestAsyncListener.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestAsyncListener.java index 08d87bf1ba3..0ed7ad203b6 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestAsyncListener.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestAsyncListener.java @@ -20,13 +20,13 @@ import java.io.IOException; import java.io.PrintWriter; -import javax.servlet.AsyncEvent; -import javax.servlet.AsyncListener; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.AsyncListener; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.foundation.common.utils.JsonUtils; diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServlet.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServlet.java index 52d6d4acb70..d4d26f0117b 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServlet.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServlet.java @@ -17,10 +17,10 @@ package org.apache.servicecomb.transport.rest.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletContextListener.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletContextListener.java index c510f261ce1..bf12b749019 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletContextListener.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletContextListener.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.transport.rest.servlet; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.springframework.context.support.AbstractApplicationContext; diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletInjector.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletInjector.java index f49c4a92287..3e3bc66665c 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletInjector.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletInjector.java @@ -19,8 +19,8 @@ import java.util.Arrays; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRegistration.Dynamic; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletProducerInvocationCreator.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletProducerInvocationCreator.java index 97cf131c56c..3efd976a0e2 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletProducerInvocationCreator.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/RestServletProducerInvocationCreator.java @@ -16,7 +16,7 @@ */ package org.apache.servicecomb.transport.rest.servlet; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import org.apache.servicecomb.common.rest.HttpTransportContext; import org.apache.servicecomb.common.rest.RestProducerInvocationCreator; diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletRestDispatcher.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletRestDispatcher.java index eaf1545ecac..7728532448b 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletRestDispatcher.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletRestDispatcher.java @@ -19,9 +19,9 @@ import java.util.List; -import javax.servlet.AsyncContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.servicecomb.common.rest.RestProducerInvocationFlow; import org.apache.servicecomb.common.rest.filter.HttpServerFilter; diff --git a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletUtils.java b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletUtils.java index 29cf057da4a..505fab1e52a 100644 --- a/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletUtils.java +++ b/transports/transport-rest/transport-rest-servlet/src/main/java/org/apache/servicecomb/transport/rest/servlet/ServletUtils.java @@ -23,10 +23,10 @@ import java.util.List; import java.util.stream.Collectors; -import javax.servlet.MultipartConfigElement; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration; -import javax.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.MultipartConfigElement; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.ServletRegistration.Dynamic; import org.apache.commons.lang3.StringUtils; import org.apache.servicecomb.common.rest.UploadConfig; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java index 93cd301c00d..ed5e023c55e 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestCseXmlWebApplicationContext.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.transport.rest.servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRegistration.Dynamic; import org.apache.servicecomb.foundation.common.Holder; import org.apache.servicecomb.foundation.common.utils.BeanUtils; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java index 40673418e91..2302d6f13b1 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestAsyncListener.java @@ -22,11 +22,11 @@ import java.io.StringWriter; import java.io.Writer; -import javax.servlet.AsyncContext; -import javax.servlet.AsyncEvent; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.core.MediaType; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.AsyncEvent; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.foundation.vertx.http.AbstractHttpServletRequest; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java index b4f2a0a9b06..4658156f554 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServlet.java @@ -17,9 +17,9 @@ package org.apache.servicecomb.transport.rest.servlet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.servicecomb.config.ConfigUtil; import org.apache.servicecomb.core.SCBEngine; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java index 75187b0f17b..5d1cadd41aa 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletContextListener.java @@ -17,8 +17,8 @@ package org.apache.servicecomb.transport.rest.servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletContextEvent; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletContextEvent; import org.junit.Test; import org.junit.jupiter.api.Assertions; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java index a3826a2b695..15d11d18421 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletInjector.java @@ -22,8 +22,8 @@ import java.net.ServerSocket; import java.net.UnknownHostException; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRegistration.Dynamic; import org.junit.Test; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java index 6090a891b86..c7a091b28db 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestRestServletProducerInvocation.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.servicecomb.common.rest.RestProducerInvocation; import org.apache.servicecomb.common.rest.definition.RestOperationMeta; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java index 950d211f76a..f72b75e1bb3 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletRestDispatcher.java @@ -19,8 +19,8 @@ import java.util.List; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.servicecomb.common.rest.filter.HttpServerFilter; import org.apache.servicecomb.core.SCBEngine; diff --git a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java index ebd1daa39c8..8b77dd7e1bc 100644 --- a/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java +++ b/transports/transport-rest/transport-rest-servlet/src/test/java/org/apache/servicecomb/transport/rest/servlet/TestServletUtils.java @@ -29,11 +29,11 @@ import java.util.List; import java.util.Map; -import javax.servlet.MultipartConfigElement; -import javax.servlet.ServletContext; -import javax.servlet.ServletRegistration; -import javax.servlet.ServletRegistration.Dynamic; -import javax.servlet.http.HttpServlet; +import jakarta.servlet.MultipartConfigElement; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.http.HttpServlet; import org.apache.servicecomb.common.rest.RestConst; import org.apache.servicecomb.foundation.common.exceptions.ServiceCombException; diff --git a/transports/transport-rest/transport-rest-vertx/pom.xml b/transports/transport-rest/transport-rest-vertx/pom.xml index e77bb861ad2..39cb654da3d 100644 --- a/transports/transport-rest/transport-rest-vertx/pom.xml +++ b/transports/transport-rest/transport-rest-vertx/pom.xml @@ -22,7 +22,7 @@ org.apache.servicecomb transport-rest - 2.9.0-SNAPSHOT + 2.10.0-SNAPSHOT transport-rest-vertx Java Chassis::Transports::Rest::Vertx diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java index 9edf23126f2..6585aec27dc 100644 --- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java +++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/RestServerVerticle.java @@ -21,8 +21,8 @@ import java.util.List; import java.util.Set; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; import org.apache.servicecomb.common.accessLog.AccessLogConfig; import org.apache.servicecomb.common.accessLog.core.element.impl.LocalHostAccessItem; diff --git a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java index d242025078f..6df3cce096c 100644 --- a/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java +++ b/transports/transport-rest/transport-rest-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestDispatcher.java @@ -17,10 +17,10 @@ package org.apache.servicecomb.transport.rest.vertx; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.Response.Status.Family; import org.apache.servicecomb.common.rest.AbstractRestInvocation; import org.apache.servicecomb.common.rest.RestConst; diff --git a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java index 0c6f85f17d2..d42412050be 100644 --- a/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java +++ b/transports/transport-rest/transport-rest-vertx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestDispatcher.java @@ -52,8 +52,8 @@ import org.junit.jupiter.api.Assertions; import org.mockito.Mockito; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response.Status; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response.Status; import java.util.HashMap; import java.util.List; import java.util.Map;