From 07df2818fe8cec3b3fd127a85b751b73456d28d7 Mon Sep 17 00:00:00 2001 From: Eric Zhao Date: Wed, 17 Jun 2020 11:10:40 +0800 Subject: [PATCH] Polish document and rearrange package for Quarkus and JAX-RS adapter Signed-off-by: Eric Zhao --- .../sentinel-jax-rs-adapter/README.md | 62 ++++++++++--------- .../sentinel-quarkus-adapter/README.md | 54 ++++++---------- ...inelAnnotationQuarkusAdapterProcessor.java | 2 +- .../annotation}/deployment/FooService.java | 2 +- .../annotation}/deployment/FooUtil.java | 2 +- .../SentinelAnnotationQuarkusAdapterTest.java | 2 +- .../resources/META-INF/quarkus-extension.yaml | 12 ++-- .../SentinelJaxRsQuarkusAdapterProcessor.java | 2 +- .../SentinelJaxRsQuarkusAdapterTest.java | 2 +- .../jaxrs}/deployment/TestResource.java | 2 +- .../resources/META-INF/quarkus-extension.yaml | 13 ++-- .../SentinelNativeImageProcessor.java | 2 +- .../nativeimage/SentinelRecorder.java | 2 +- .../resources/META-INF/quarkus-extension.yaml | 13 ++-- 14 files changed, 84 insertions(+), 88 deletions(-) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/{annotation/quarkus/adapter => adapter/quarkus/annotation}/deployment/SentinelAnnotationQuarkusAdapterProcessor.java (95%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/{annotation/quarkus/adapter => adapter/quarkus/annotation}/deployment/FooService.java (97%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/{annotation/quarkus/adapter => adapter/quarkus/annotation}/deployment/FooUtil.java (94%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/{annotation/quarkus/adapter => adapter/quarkus/annotation}/deployment/SentinelAnnotationQuarkusAdapterTest.java (99%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/{jaxrs/quarkus/adapter => adapter/quarkus/jaxrs}/deployment/SentinelJaxRsQuarkusAdapterProcessor.java (95%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/{jaxrs/quarkus/adapter => adapter/quarkus/jaxrs}/deployment/SentinelJaxRsQuarkusAdapterTest.java (99%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/{jaxrs/quarkus/adapter => adapter/quarkus/jaxrs}/deployment/TestResource.java (97%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/{ => adapter/quarkus}/nativeimage/SentinelNativeImageProcessor.java (98%) rename sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/java/com/alibaba/csp/sentinel/{ => adapter/quarkus}/nativeimage/SentinelRecorder.java (97%) diff --git a/sentinel-adapter/sentinel-jax-rs-adapter/README.md b/sentinel-adapter/sentinel-jax-rs-adapter/README.md index ebc35cd4..50ac623d 100755 --- a/sentinel-adapter/sentinel-jax-rs-adapter/README.md +++ b/sentinel-adapter/sentinel-jax-rs-adapter/README.md @@ -1,6 +1,6 @@ -# Sentinel for jax-rs +# Sentinel adapter for JAX-RS -Sentinel provides filter integration to enable flow control for web requests. +Sentinel provides integration to enable fault-tolerance and flow control for JAX-RS web requests. Add the following dependency in `pom.xml` (if you are using Maven): ```xml @@ -13,7 +13,7 @@ Add the following dependency in `pom.xml` (if you are using Maven): ## SentinelJaxRsProviderFilter -the `SentinelJaxRsProviderFilter` is auto activated in pure jax-rs application. +The `SentinelJaxRsProviderFilter` is auto activated in pure JAX-RS application. For Spring web applications you can configure with Spring bean: @@ -30,50 +30,54 @@ public class FilterConfig { ## DefaultExceptionMapper -Sentinel provides DefaultExceptionMapper to map Throwable to Response(with Status.INTERNAL_SERVER_ERROR), in order to let SentinelJaxRsProviderFilter to be called and exit the sentinel entry. +Sentinel provides DefaultExceptionMapper to map Throwable to Response (with Status.INTERNAL_SERVER_ERROR), +in order to let SentinelJaxRsProviderFilter to be called and exit the Sentinel entry. -according to `3.3.4 Exceptions` of [jaxrs-2_1-final-spec](https://download.oracle.com/otn-pub/jcp/jaxrs-2_1-final-eval-spec/jaxrs-2_1-final-spec.pdf): ->Checked exceptions and throwables that have not been mapped and cannot be thrown directly MUSTbe wrapped in a container-specific exception that is then thrown and allowed to propagate to the un-derlying container. +According to `3.3.4 Exceptions` of [jaxrs-2_1-final-spec](https://download.oracle.com/otn-pub/jcp/jaxrs-2_1-final-eval-spec/jaxrs-2_1-final-spec.pdf): -if WebApplicationException or its subclasses is thrown, there are automated converted to Response and can enter response filter. +> Checked exceptions and throwables that have not been mapped and cannot be thrown directly MUST be wrapped in a container-specific exception that is then thrown and allowed to propagate to the underlying container. -if throw exception which is not WebApplicationException or its subclass, and not matched by custom exception mapper, then the response filter cannot be called. for this case, I thank a default exception mapper maybe introduced. +If WebApplicationException or its subclasses are thrown, they'll be automatically converted to `Response` and can enter response filter. +If other kind of exceptions were thrown, and not matched by custom exception mapper, then the response filter cannot be called. +For this case, a default exception mapper maybe introduced. -according to `4.4 Exception Mapping Providers` of [jaxrs-2_1-final-spec](https://download.oracle.com/otn-pub/jcp/jaxrs-2_1-final-eval-spec/jaxrs-2_1-final-spec.pdf): ->When choosing an exception mapping provider to map an exception, an implementation MUST use theprovider whose generic type is the nearest superclass of the exception. If two or more exception providers are applicable, the one with the highest priority MUST be chosen as described in Section 4.1.3. +According to `4.4 Exception Mapping Providers` of [jaxrs-2_1-final-spec](https://download.oracle.com/otn-pub/jcp/jaxrs-2_1-final-eval-spec/jaxrs-2_1-final-spec.pdf): -if user also provide custom exception mapper of `Throwable`, then user has the responsibility to convert it to response and then the response filter can be called. +> When choosing an exception mapping provider to map an exception, an implementation MUST use the provider whose generic type is the nearest superclass of the exception. If two or more exception providers are applicable, the one with the highest priority MUST be chosen as described in Section 4.1.3. -as describe in `6.7.1 exceptions` of [jaxrs-2_1-final-spec](https://download.oracle.com/otn-pub/jcp/jaxrs-2_1-final-eval-spec/jaxrs-2_1-final-spec.pdf): ->A response mapped from an exception MUST be processed using the ContainerResponsefilter chain and theWriteTointerceptor chain (if an entity is present in the mapped response). +If user also provides customized exception mapper of `Throwable`, then user has the responsibility to convert it to response and then the response filter can be called. + +As describe in `6.7.1 exceptions` of [jaxrs-2_1-final-spec](https://download.oracle.com/otn-pub/jcp/jaxrs-2_1-final-eval-spec/jaxrs-2_1-final-spec.pdf): + +> A response mapped from an exception MUST be processed using the ContainerResponse filter chain and the WriteTo interceptor chain (if an entity is present in the mapped response). ## SentinelJaxRsClientTemplate For jax-rs client, we provide `SentinelJaxRsClientTemplate` you can use it like this: ``` - Response response = SentinelJaxRsClientTemplate.execute(resourceName, new Supplier() { - @Override - public Response get() { - return client.target(host).path(url).request() - .get(); - } - }); +Response response = SentinelJaxRsClientTemplate.execute(resourceName, new Supplier() { + @Override + public Response get() { + return client.target(host).path(url).request() + .get(); + } +}); ``` or executeAsync like this: ``` - Future future = SentinelJaxRsClientTemplate.executeAsync(resourceName, new Supplier>() { - @Override - public Future get() { - return client.target(host).path(url).request() - .async() - .get(); - } - }); +Future future = SentinelJaxRsClientTemplate.executeAsync(resourceName, new Supplier>() { + @Override + public Future get() { + return client.target(host).path(url).request() + .async() + .get(); + } +}); ``` -When a request is blocked, Sentinel jax-rs filter will return Response with status of TOO_MANY_REQUESTS indicating the request is rejected. +When a request is blocked, Sentinel JAX-RS filter will return Response with status of `TOO_MANY_REQUESTS` indicating the request is rejected. You can customize it by implement your own `SentinelJaxRsFallback` and register to `SentinelJaxRsConfig`. diff --git a/sentinel-adapter/sentinel-quarkus-adapter/README.md b/sentinel-adapter/sentinel-quarkus-adapter/README.md index 4c8794e0..c7ee5e8f 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/README.md +++ b/sentinel-adapter/sentinel-quarkus-adapter/README.md @@ -1,8 +1,10 @@ -# sentinel quarkus adapter +# Sentinel Quarkus Adapter -sentinel quarkus adapter provides `sentinel-annotation-quarkus-adapter` and `sentinel-jax-rs-quarkus-adapter` to adapt `sentinel-annotation-cdi-interceptor` and `sentinel-jax-rs-adapter` for quarkus +Sentinel provides `sentinel-annotation-quarkus-adapter` and `sentinel-jax-rs-quarkus-adapter` to +adapt [sentinel-annotation-cdi-interceptor](https://github.com/alibaba/Sentinel/tree/master/sentinel-extension/sentiel-annotation-cdi-interceptor) +and [sentinel-jax-rs-adapter](https://github.com/alibaba/Sentinel/tree/master/sentinel-adapter/sentinel-jax-rs-adapter) for Quarkus. -sentinel quarkus adapter also provides `sentinel-native-image-quarkus-adapter` to support running sentinel with quarkus in native image mode. +The integration module also provides `sentinel-native-image-quarkus-adapter` to support running Sentinel with Quarkus in native image mode. To use sentinel-jax-rs-quarkus-adapter, you can simply add the following dependency to your `pom.xml`: @@ -24,30 +26,16 @@ To use sentinel-annotation-quarkus-adapter, you can simply add the following dep ``` -if your quarkus application want to use both `sentinel-annotation-quarkus-adapter` and `sentinel-jax-rs-quarkus-adapter` , then add these two dependency together to your `pom.xml`: - -```xml - - com.alibaba.csp - sentinel-jax-rs-quarkus-adapter - x.y.z - - - com.alibaba.csp - sentinel-annotation-quarkus-adapter - x.y.z - -``` - -when quarkus application started, you can see the enabled feature like: +When Quarkus application started, you can see the enabled feature like: ``` INFO [io.quarkus] (Quarkus Main Thread) Installed features: [cdi, resteasy, sentinel-annotation, sentinel-jax-rs] ``` -## for quarkus native image +## For Quarkus native image -if you want to make sentinel with quarkus running in native image mode, you should add the following dependency to your `pom.xml`: +If you want to integrate Quarkus with Sentinel while running in native image mode, +you should add the following dependency to your `pom.xml`: ```xml @@ -57,30 +45,28 @@ if you want to make sentinel with quarkus running in native image mode, you shou ``` -and then add `--allow-incomplete-classpath` to `quarkus.native.additional-build-args`. +And then add `--allow-incomplete-classpath` to `quarkus.native.additional-build-args`. -if you use `sentinel-jax-rs-quarkus-adapter` you should set `quarkus.native.auto-service-loader-registration` to true. +If you're using `sentinel-jax-rs-quarkus-adapter`, you'll need to set `quarkus.native.auto-service-loader-registration` to true. -you can refer to `sentinel-demo-quarkus`'s `pom.xml` for more details. - -when quarkus application started, you can see the enabled feature like: +When Quarkus application started, you can see the enabled feature like: ``` INFO [io.quarkus] (main) Installed features: [cdi, resteasy, sentinel-annotation, sentinel-jax-rs, sentinel-native-image] ``` -### notes for limitations +For more details you may refer to the `pom.xml` of [sentinel-demo-quarkus](https://github.com/alibaba/Sentinel/tree/master/sentinel-demo/sentinel-demo-quarkus). -`sentinel-native-image-quarkus-adapter` currently rely on `sentinel-logging-slf4j` to make sentinel run in native image mode easily, because `quarkus-core` provides `Target_org_slf4j_LoggerFactory` to substitue `getLogger` method. +### Limitations -currently `sentinel-transport-simple-http` can work in native image mode, while `sentinel-transport-netty-http` cannot work in native image mode without extra config or substitutions. +`sentinel-native-image-quarkus-adapter` currently relies on `sentinel-logging-slf4j` to help Sentinel +run in native image mode easily, because `quarkus-core` provides `Target_org_slf4j_LoggerFactory` to substitute `getLogger` method. -## references for build native image or AOT +Currently `sentinel-transport-simple-http` can work in native image mode, while `sentinel-transport-netty-http` cannot work in native image mode without extra config or substitutions. + +## References for build native image or AOT - [Quarkus - Tips for writing native applications](https://quarkus.io/guides/writing-native-applications-tips) - - [Quarkus - Class Loading Reference](https://quarkus.io/guides/class-loading-reference) - -- [substratevm LIMITATIONS](https://github.com/oracle/graal/blob/master/substratevm/LIMITATIONS.md) - +- [SubstrateVM LIMITATIONS](https://github.com/oracle/graal/blob/master/substratevm/LIMITATIONS.md) - [Accessing resources in Substrate VM images](https://github.com/oracle/graal/blob/master/substratevm/RESOURCES.md) diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/SentinelAnnotationQuarkusAdapterProcessor.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/SentinelAnnotationQuarkusAdapterProcessor.java similarity index 95% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/SentinelAnnotationQuarkusAdapterProcessor.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/SentinelAnnotationQuarkusAdapterProcessor.java index 3e958fa1..111d5185 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/SentinelAnnotationQuarkusAdapterProcessor.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/SentinelAnnotationQuarkusAdapterProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.annotation.quarkus.adapter.deployment; +package com.alibaba.csp.sentinel.adapter.quarkus.annotation.deployment; import com.alibaba.csp.sentinel.annotation.cdi.interceptor.SentinelResourceInterceptor; import io.quarkus.arc.deployment.AdditionalBeanBuildItem; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/FooService.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/FooService.java similarity index 97% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/FooService.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/FooService.java index 1115a9e3..8f3b7654 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/FooService.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/FooService.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.annotation.quarkus.adapter.deployment; +package com.alibaba.csp.sentinel.adapter.quarkus.annotation.deployment; import com.alibaba.csp.sentinel.annotation.cdi.interceptor.SentinelResourceBinding; import com.alibaba.csp.sentinel.slots.block.BlockException; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/FooUtil.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/FooUtil.java similarity index 94% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/FooUtil.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/FooUtil.java index 38fd6874..adc1d881 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/FooUtil.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/FooUtil.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.annotation.quarkus.adapter.deployment; +package com.alibaba.csp.sentinel.adapter.quarkus.annotation.deployment; import com.alibaba.csp.sentinel.slots.block.BlockException; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/SentinelAnnotationQuarkusAdapterTest.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/SentinelAnnotationQuarkusAdapterTest.java similarity index 99% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/SentinelAnnotationQuarkusAdapterTest.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/SentinelAnnotationQuarkusAdapterTest.java index 6747a519..1a0f34e1 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/annotation/quarkus/adapter/deployment/SentinelAnnotationQuarkusAdapterTest.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/annotation/deployment/SentinelAnnotationQuarkusAdapterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.annotation.quarkus.adapter.deployment; +package com.alibaba.csp.sentinel.adapter.quarkus.annotation.deployment; import com.alibaba.csp.sentinel.node.ClusterNode; import com.alibaba.csp.sentinel.slots.block.flow.FlowRule; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml index b9bf0dac..0d3819f0 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-annotation-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,11 +1,13 @@ --- -name: "sentinel annotation extension" +name: "Sentinel annotation CDI extension" metadata: keywords: - "sentinel" - - "rate limit" - - "circuit breaker" + - "rate-limiting" + - "resiliency" + - "circuit-breaker" + - "fault-tolerance" categories: - - "rate limit" - - "circuit breaker" + - "fault-tolerance" + - "cloud" status: "preview" diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/SentinelJaxRsQuarkusAdapterProcessor.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/SentinelJaxRsQuarkusAdapterProcessor.java similarity index 95% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/SentinelJaxRsQuarkusAdapterProcessor.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/SentinelJaxRsQuarkusAdapterProcessor.java index c5ceb0d3..34ee9cc5 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/SentinelJaxRsQuarkusAdapterProcessor.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/SentinelJaxRsQuarkusAdapterProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.jaxrs.quarkus.adapter.deployment; +package com.alibaba.csp.sentinel.adapter.quarkus.jaxrs.deployment; import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/SentinelJaxRsQuarkusAdapterTest.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/SentinelJaxRsQuarkusAdapterTest.java similarity index 99% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/SentinelJaxRsQuarkusAdapterTest.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/SentinelJaxRsQuarkusAdapterTest.java index 2f7ac058..bcdf5d73 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/SentinelJaxRsQuarkusAdapterTest.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/SentinelJaxRsQuarkusAdapterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.jaxrs.quarkus.adapter.deployment; +package com.alibaba.csp.sentinel.adapter.quarkus.jaxrs.deployment; import com.alibaba.csp.sentinel.Constants; import com.alibaba.csp.sentinel.adapter.jaxrs.config.SentinelJaxRsConfig; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/TestResource.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/TestResource.java similarity index 97% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/TestResource.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/TestResource.java index b982a985..bee78ed5 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/jaxrs/quarkus/adapter/deployment/TestResource.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-deployment/src/test/java/com/alibaba/csp/sentinel/adapter/quarkus/jaxrs/deployment/TestResource.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.jaxrs.quarkus.adapter.deployment; +package com.alibaba.csp.sentinel.adapter.quarkus.jaxrs.deployment; import javax.ws.rs.*; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml index 940f5555..cd2ae15e 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-jax-rs-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,11 +1,14 @@ --- -name: "sentinel jax rs extension" +name: "Sentinel extension for JAX-RS" metadata: keywords: - - "resteasy" - - "jaxrs" - "sentinel" + - "rate-limiting" + - "resiliency" + - "circuit-breaker" + - "fault-tolerance" + - "jax-rs" categories: - - "web" - - "circuit breaker" + - "fault-tolerance" + - "cloud" status: "preview" diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/nativeimage/SentinelNativeImageProcessor.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/nativeimage/SentinelNativeImageProcessor.java similarity index 98% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/nativeimage/SentinelNativeImageProcessor.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/nativeimage/SentinelNativeImageProcessor.java index 82935045..32654a78 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/nativeimage/SentinelNativeImageProcessor.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-deployment/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/nativeimage/SentinelNativeImageProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.nativeimage; +package com.alibaba.csp.sentinel.adapter.quarkus.nativeimage; import com.alibaba.csp.sentinel.slots.DefaultSlotChainBuilder; import io.quarkus.deployment.annotations.BuildProducer; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/java/com/alibaba/csp/sentinel/nativeimage/SentinelRecorder.java b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/nativeimage/SentinelRecorder.java similarity index 97% rename from sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/java/com/alibaba/csp/sentinel/nativeimage/SentinelRecorder.java rename to sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/nativeimage/SentinelRecorder.java index 8d17e548..9a2ae346 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/java/com/alibaba/csp/sentinel/nativeimage/SentinelRecorder.java +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/java/com/alibaba/csp/sentinel/adapter/quarkus/nativeimage/SentinelRecorder.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.csp.sentinel.nativeimage; +package com.alibaba.csp.sentinel.adapter.quarkus.nativeimage; import com.alibaba.csp.sentinel.command.vo.NodeVo; import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule; diff --git a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml index c072df2f..f8eed193 100644 --- a/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml +++ b/sentinel-adapter/sentinel-quarkus-adapter/sentinel-native-image-quarkus-adapter-runtime/src/main/resources/META-INF/quarkus-extension.yaml @@ -1,12 +1,13 @@ --- -name: "sentinel native image extension" +name: "Sentinel native image extension" metadata: keywords: - "sentinel" - - "rate limit" - - "circuit breaker" - - "native image" + - "rate-limiting" + - "circuit-breaker" + - "native-image" + - "fault-tolerance" categories: - - "rate limit" - - "circuit breaker" + - "cloud" + - "fault-tolerance" status: "preview"