This is an automated email from the ASF dual-hosted git repository.
liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git
commit 1a9b3ffd7cb8222e54d9ff8a04974cc7dae5dfae
Author: liubao <bi...@qq.com>
AuthorDate: Mon Oct 9 14:59:59 2023 +0800
[SCB-2008]remove un-maintained jsr305 usages
---
.../common/rest/RestProducerInvocationCreator.java | 4 +-
.../rest/RestVertxProducerInvocationCreator.java | 6 +-
.../rest/codec/query/AbstractQueryCodec.java | 7 +-
.../common/rest/codec/query/QueryCodec.java | 12 ++--
.../common/rest/codec/query/QueryCodecMulti.java | 4 +-
.../rest/codec/query/QueryCodecWithDelimiter.java | 7 +-
.../common/rest/codec/query/QueryCodecs.java | 8 +--
.../common/rest/codec/query/QueryCodecsUtils.java | 3 -
.../rest/definition/path/URLPathBuilder.java | 4 +-
.../rest/filter/inner/RestServerCodecFilter.java | 5 +-
.../core/exception/DefaultExceptionProcessor.java | 15 ++--
.../core/exception/ExceptionConverter.java | 7 +-
.../core/exception/ExceptionProcessor.java | 18 +++--
.../servicecomb/core/exception/Exceptions.java | 14 ++--
.../ConnectTimeoutExceptionConverter.java | 6 +-
.../converter/DefaultExceptionConverter.java | 8 +--
.../IllegalArgumentExceptionConverter.java | 7 +-
.../converter/InvocationExceptionConverter.java | 7 +-
.../converter/ServiceCombExceptionConverter.java | 9 ++-
.../converter/TimeoutExceptionConverter.java | 7 +-
.../servicecomb/core/filter/ConsumerFilter.java | 3 -
.../org/apache/servicecomb/core/filter/Filter.java | 3 -
.../servicecomb/core/filter/ProviderFilter.java | 3 -
.../servicecomb/core/filter/impl/EmptyFilter.java | 3 -
.../core/filter/impl/ParameterValidatorFilter.java | 3 -
.../core/filter/impl/ProviderOperationFilter.java | 3 -
.../core/filter/impl/ScheduleFilter.java | 3 -
.../core/provider/consumer/InvokerUtils.java | 6 +-
.../servicecomb/core/exception/ExceptionsTest.java | 6 +-
.../servicecomb/core/filter/SimpleRetryFilter.java | 3 -
...CustomExceptionToProducerResponseConverter.java | 9 ++-
.../service/encrypt/filter/DecodeBodyFilter.java | 3 -
.../encrypt/filter/EdgeSignatureRequestFilter.java | 3 -
.../filter/EdgeSignatureResponseFilter.java | 3 -
.../edge/service/encrypt/filter/UserIdFilter.java | 3 -
.../demo/edge/service/handler/AuthHandler.java | 3 -
.../springboot/pojo/server/handler/MyHandler.java | 3 -
.../demo/springmvc/filter/ProviderTestFilter.java | 3 -
dependencies/default/pom.xml | 18 -----
.../servicecomb/edge/core/EdgeAddHeaderFilter.java | 3 -
.../edge/core/EdgeServerCodecFilter.java | 4 --
.../config/priority/ConfigObjectProperty.java | 4 +-
.../servicecomb/config/DynamicPropertiesTest.java | 8 +--
.../internal/parser/ContentFileReader.java | 4 +-
foundations/foundation-test-scaffolding/pom.xml | 4 --
.../test/scaffolding/config/ArchaiusUtils.java | 83 ----------------------
.../faultinjection/ConsumerAbortFaultFilter.java | 3 -
.../faultinjection/ConsumerDelayFaultFilter.java | 3 -
.../servicecomb/qps/ConsumerFlowControlFilter.java | 3 -
.../servicecomb/qps/ProviderFlowControlFilter.java | 3 -
.../governance/ConsumerInstanceBulkheadFilter.java | 5 +-
.../ConsumerInstanceIsolationFilter.java | 3 -
.../handler/governance/ProviderBulkheadFilter.java | 3 -
.../governance/ProviderCircuitBreakerFilter.java | 3 -
.../governance/ProviderRateLimitingFilter.java | 3 -
.../servicecomb/loadbalance/LoadBalanceFilter.java | 3 -
.../consumer/ConsumerAuthFilter.java | 3 -
.../provider/ProviderAuthFilter.java | 3 -
.../router/custom/RouterAddHeaderFilter.java | 3 -
.../provider/pojo/FilterInvocationCaller.java | 4 +-
.../provider/pojo/definition/PojoConsumerMeta.java | 3 -
.../transport/highway/HighwayClientFilter.java | 3 -
.../highway/HighwayServerCodecFilter.java | 3 -
.../rest/client/RestClientCodecFilter.java | 3 -
.../transport/rest/client/RestClientEncoder.java | 15 ++--
.../client/RestClientRequestParametersImpl.java | 6 +-
.../rest/client/RestClientSenderFilter.java | 3 -
.../RestServletProducerInvocationCreator.java | 6 +-
68 files changed, 80 insertions(+), 359 deletions(-)
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 df5eebc83..60eb56c6f 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
@@ -23,8 +23,6 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.common.rest.codec.produce.ProduceProcessor;
import org.apache.servicecomb.common.rest.definition.RestOperationMeta;
@@ -62,7 +60,7 @@ public abstract class RestProducerInvocationCreator
implements InvocationCreator
protected ProduceProcessor produceProcessor;
public RestProducerInvocationCreator(MicroserviceMeta microserviceMeta,
Endpoint endpoint,
- @Nonnull HttpServletRequestEx requestEx, @Nonnull HttpServletResponseEx
responseEx) {
+ HttpServletRequestEx requestEx, HttpServletResponseEx responseEx) {
this.microserviceMeta = microserviceMeta;
this.endpoint = endpoint;
this.requestEx = requestEx;
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 a809f0968..83f14c64e 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,8 +16,6 @@
*/
package org.apache.servicecomb.common.rest;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.definition.MicroserviceMeta;
@@ -29,9 +27,9 @@ import io.vertx.ext.web.RoutingContext;
public class RestVertxProducerInvocationCreator extends
RestProducerInvocationCreator {
private final RoutingContext routingContext;
- public RestVertxProducerInvocationCreator(@Nonnull RoutingContext
routingContext,
+ public RestVertxProducerInvocationCreator(RoutingContext routingContext,
MicroserviceMeta microserviceMeta, Endpoint endpoint,
- @Nonnull HttpServletRequestEx requestEx, @Nonnull HttpServletResponseEx
responseEx) {
+ HttpServletRequestEx requestEx, HttpServletResponseEx responseEx) {
super(microserviceMeta, endpoint, requestEx, responseEx);
this.routingContext = routingContext;
}
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 2817f9da8..5e0d19630 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,9 +20,6 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import
org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
public abstract class AbstractQueryCodec implements QueryCodec {
@@ -39,7 +36,7 @@ public abstract class AbstractQueryCodec implements
QueryCodec {
@Override
@SuppressWarnings("unchecked")
- public void encode(URLPathStringBuilder builder, String name, @Nullable
Object value) throws Exception {
+ public void encode(URLPathStringBuilder builder, String name, Object value)
throws Exception {
if (value == null) {
// not write query key to express "null"
return;
@@ -58,5 +55,5 @@ public abstract class AbstractQueryCodec implements
QueryCodec {
encode(builder, name, Collections.singletonList(value));
}
- abstract void encode(URLPathStringBuilder builder, String name, @Nonnull
Collection<Object> values) throws Exception;
+ abstract void encode(URLPathStringBuilder builder, String name,
Collection<Object> values) throws Exception;
}
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 7a6478789..3282cc190 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,25 +20,23 @@ import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import javax.annotation.Nonnull;
-import javax.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;
import
org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
import org.springframework.core.Ordered;
+import jakarta.servlet.http.HttpServletRequest;
+
/**
* bigger order will override the same name codec
*/
public interface QueryCodec extends Ordered {
- static String encodeValue(@Nonnull Object value) throws
UnsupportedEncodingException {
+ static String encodeValue(Object value) throws UnsupportedEncodingException {
return URLEncoder.encode(value.toString(), StandardCharsets.UTF_8.name());
}
// can not replaced by value.toString() because of date serialize
- static String convertToString(@Nonnull Object value) throws Exception {
+ static String convertToString(Object value) throws Exception {
return
RestObjectMapperFactory.getRestObjectMapper().convertToString(value);
}
@@ -49,7 +47,7 @@ public interface QueryCodec extends Ordered {
String getCodecName();
- void encode(URLPathStringBuilder builder, String name, @Nullable Object
value) throws Exception;
+ void encode(URLPathStringBuilder builder, String name, Object value) throws
Exception;
Object decode(QueryProcessor processor, HttpServletRequest request);
}
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 6ea0ec4a8..551ccee01 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
@@ -19,8 +19,6 @@ package org.apache.servicecomb.common.rest.codec.query;
import java.util.Collection;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.common.rest.RestConst;
import
org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator.QueryProcessor;
import
org.apache.servicecomb.common.rest.definition.path.URLPathBuilder.URLPathStringBuilder;
@@ -39,7 +37,7 @@ public class QueryCodecMulti extends AbstractQueryCodec {
}
@Override
- public void encode(URLPathStringBuilder builder, String name, @Nonnull
Collection<Object> values) throws Exception {
+ public void encode(URLPathStringBuilder builder, String name,
Collection<Object> values) throws Exception {
for (Object value : values) {
if (value == null) {
continue;
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 ddd389757..f3452bf37 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,12 +19,11 @@ package org.apache.servicecomb.common.rest.codec.query;
import java.util.Collection;
import java.util.StringJoiner;
-import javax.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;
+import jakarta.servlet.http.HttpServletRequest;
+
/**
* can not support value with delimiter<br>
* a csv example, a collection with two values:<br>
@@ -44,7 +43,7 @@ public class QueryCodecWithDelimiter extends
AbstractQueryCodec {
}
@Override
- public void encode(URLPathStringBuilder builder, String name, @Nonnull
Collection<Object> values) throws Exception {
+ public void encode(URLPathStringBuilder builder, String name,
Collection<Object> values) throws Exception {
String joined = join(values);
if (joined == null) {
return;
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 bad8f6889..41c5098ef 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,9 +21,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -48,7 +45,7 @@ public class QueryCodecs {
defaultCodec = codecs.get(QueryCodecMulti.CODEC_NAME);
}
- private void register(@Nonnull QueryCodec codec) {
+ private void register(QueryCodec codec) {
QueryCodec exists = codecs.put(codec.getCodecName(), codec);
if (exists != null) {
LOGGER.info("override QueryCodec, exists={}, new={}.",
@@ -56,8 +53,7 @@ public class QueryCodecs {
}
}
- @Nonnull
- public QueryCodec find(@Nullable String name) {
+ public QueryCodec find(String name) {
if (name == null) {
return defaultCodec;
}
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 b1185673b..4b54210c7 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,6 @@
*/
package org.apache.servicecomb.common.rest.codec.query;
-import javax.annotation.Nonnull;
-
import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.parameters.Parameter.StyleEnum;
@@ -29,7 +27,6 @@ public class QueryCodecsUtils {
QueryCodecsUtils.queryCodecs = queryCodecs;
}
- @Nonnull
public static QueryCodec find(Parameter.StyleEnum styleEnum, Boolean
explode) {
return queryCodecs.find(formatName(styleEnum, explode));
}
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 8d9e07ead..c7eacf891 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,8 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.common.rest.codec.param.QueryProcessorCreator;
import org.apache.servicecomb.common.rest.definition.RestParam;
@@ -129,7 +127,7 @@ public class URLPathBuilder {
return this;
}
- public URLPathStringBuilder appendQuery(@Nonnull String name, @Nonnull
String encodedValue) {
+ public URLPathStringBuilder appendQuery(String name, String encodedValue) {
if (queryPrefixNotWrite) {
stringBuilder.append('?');
queryPrefixNotWrite = false;
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 614e4789f..2d74f4c8e 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,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.common.rest.HttpTransportContext;
import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.common.rest.codec.RestCodec;
@@ -59,7 +57,6 @@ public class RestServerCodecFilter implements ProviderFilter {
public static final String NAME = "rest-server-codec";
- @Nonnull
@Override
public String getName() {
return NAME;
@@ -116,7 +113,7 @@ public class RestServerCodecFilter implements
ProviderFilter {
public static CompletableFuture<Response> encodeResponse(Response response,
boolean download,
ProduceProcessor produceProcessor, HttpServletResponseEx responseEx) {
responseEx.setStatus(response.getStatusCode());
- copyHeadersToHttpResponse(response.getHeaders(), responseEx);
+ copyHeadersToHttpResponse(response.getHeaders(), responseEx);
if (download) {
return CompletableFuture.completedFuture(response);
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 d79ddf010..306ad3395 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
@@ -29,9 +29,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.servicecomb.config.inject.InjectProperties;
import org.apache.servicecomb.config.inject.InjectProperty;
import org.apache.servicecomb.core.Invocation;
@@ -105,13 +102,13 @@ public class DefaultExceptionProcessor implements
ExceptionProcessor {
}
@Override
- public InvocationException convert(@Nonnull Invocation invocation, Throwable
throwable) {
+ public InvocationException convert(Invocation invocation, Throwable
throwable) {
StatusType genericStatus = CONSUMER.equals(invocation.getInvocationType())
? BAD_REQUEST : INTERNAL_SERVER_ERROR;
return convert(invocation, throwable, genericStatus);
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
Throwable throwable, StatusType genericStatus) {
+ public InvocationException convert(Invocation invocation, Throwable
throwable, StatusType genericStatus) {
Throwable unwrapped = ExceptionFactory.unwrap(throwable);
try {
ExceptionConverter<Throwable> converter =
@@ -149,7 +146,7 @@ public class DefaultExceptionProcessor implements
ExceptionProcessor {
}
@Override
- public void logConsumerException(@Nonnull Invocation invocation, @Nonnull
InvocationException exception) {
+ public void logConsumerException(Invocation invocation, InvocationException
exception) {
if (isIgnoreLog(invocation, exception)) {
return;
}
@@ -171,7 +168,7 @@ public class DefaultExceptionProcessor implements
ExceptionProcessor {
}
@Override
- public boolean isIgnoreLog(@Nonnull Invocation invocation, @Nonnull
InvocationException exception) {
+ public boolean isIgnoreLog(Invocation invocation, InvocationException
exception) {
if (!isPrintRateLimit() && exception.getStatusCode() ==
TOO_MANY_REQUESTS.getStatusCode()) {
return true;
}
@@ -180,7 +177,7 @@ public class DefaultExceptionProcessor implements
ExceptionProcessor {
}
@Override
- public Response toProducerResponse(@Nullable Invocation invocation,
Throwable exception) {
+ public Response toProducerResponse(Invocation invocation, Throwable
exception) {
InvocationException invocationException = convert(invocation, exception,
INTERNAL_SERVER_ERROR);
if (invocation != null) {
logProducerException(invocation, invocationException);
@@ -190,7 +187,7 @@ public class DefaultExceptionProcessor implements
ExceptionProcessor {
}
@Override
- public void logProducerException(@Nonnull Invocation invocation, @Nonnull
InvocationException exception) {
+ public void logProducerException(Invocation invocation, InvocationException
exception) {
if (isIgnoreLog(invocation, exception)) {
return;
}
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 38be81e8a..b64245647 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
@@ -20,13 +20,12 @@ 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 jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.foundation.common.utils.SPIOrder;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
+import jakarta.ws.rs.core.Response.StatusType;
+
public interface ExceptionConverter<T extends Throwable> extends SPIOrder {
static boolean isClient(StatusType status) {
return CLIENT_ERROR.equals(status.getFamily());
@@ -50,5 +49,5 @@ public interface ExceptionConverter<T extends Throwable>
extends SPIOrder {
* @param genericStatus if can not determine the status type, then use this
input value
* @return converted invocation exception
*/
- InvocationException convert(@Nullable Invocation invocation, T throwable,
StatusType genericStatus);
+ InvocationException convert(Invocation invocation, T throwable, StatusType
genericStatus);
}
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 dac16812e..ffb3619bb 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,15 +17,13 @@
package org.apache.servicecomb.core.exception;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.springframework.core.Ordered;
+import jakarta.ws.rs.core.Response.StatusType;
+
/**
* will select the min order instance
*/
@@ -37,17 +35,17 @@ public interface ExceptionProcessor extends Ordered {
boolean isPrintStackTrace();
- InvocationException convert(@Nonnull Invocation invocation, Throwable
throwable);
+ InvocationException convert(Invocation invocation, Throwable throwable);
- InvocationException convert(@Nullable Invocation invocation, Throwable
throwable, StatusType genericStatus);
+ InvocationException convert(Invocation invocation, Throwable throwable,
StatusType genericStatus);
- boolean isIgnoreLog(@Nonnull Invocation invocation, @Nonnull
InvocationException exception);
+ boolean isIgnoreLog(Invocation invocation, InvocationException exception);
Response toConsumerResponse(Invocation invocation, Throwable throwable);
- void logConsumerException(@Nonnull Invocation invocation, @Nonnull
InvocationException exception);
+ void logConsumerException(Invocation invocation, InvocationException
exception);
- Response toProducerResponse(@Nullable Invocation invocation, Throwable
exception);
+ Response toProducerResponse(Invocation invocation, Throwable exception);
- void logProducerException(@Nonnull Invocation invocation, @Nonnull
InvocationException exception);
+ void logProducerException(Invocation invocation, InvocationException
exception);
}
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 719d9f461..0fb8ad418 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
@@ -26,16 +26,14 @@ import static
org.apache.servicecomb.swagger.invocation.InvocationType.CONSUMER;
import java.util.Comparator;
import java.util.List;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.swagger.invocation.Response;
import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.springframework.beans.factory.annotation.Autowired;
+import jakarta.ws.rs.core.Response.StatusType;
+
public class Exceptions {
private static ExceptionProcessor processor = new
DefaultExceptionProcessor();
@@ -102,7 +100,7 @@ public class Exceptions {
return producer(GENERIC_SERVER, msg, cause);
}
- public static StatusType getGenericStatus(@Nonnull Invocation invocation) {
+ public static StatusType getGenericStatus(Invocation invocation) {
return CONSUMER.equals(invocation.getInvocationType()) ? BAD_REQUEST :
INTERNAL_SERVER_ERROR;
}
@@ -110,15 +108,15 @@ public class Exceptions {
return processor.toConsumerResponse(invocation, throwable);
}
- public static Response toProducerResponse(@Nullable Invocation invocation,
Throwable exception) {
+ public static Response toProducerResponse(Invocation invocation, Throwable
exception) {
return processor.toProducerResponse(invocation, exception);
}
- public static InvocationException convert(@Nonnull Invocation invocation,
Throwable throwable) {
+ public static InvocationException convert(Invocation invocation, Throwable
throwable) {
return processor.convert(invocation, throwable);
}
- public static InvocationException convert(@Nullable Invocation invocation,
Throwable throwable,
+ public static InvocationException convert(Invocation invocation, Throwable
throwable,
StatusType genericStatus) {
return processor.convert(invocation, throwable, genericStatus);
}
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 4b93eafe5..72507d0a3 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
@@ -18,9 +18,6 @@ package org.apache.servicecomb.core.exception.converter;
import static jakarta.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
@@ -28,6 +25,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.netty.channel.ConnectTimeoutException;
+import jakarta.ws.rs.core.Response.StatusType;
public class ConnectTimeoutExceptionConverter implements
ExceptionConverter<ConnectTimeoutException> {
private static final Logger LOGGER =
LoggerFactory.getLogger(ConnectTimeoutExceptionConverter.class);
@@ -45,7 +43,7 @@ public class ConnectTimeoutExceptionConverter implements
ExceptionConverter<Conn
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
ConnectTimeoutException throwable,
+ public InvocationException convert(Invocation invocation,
ConnectTimeoutException throwable,
StatusType genericStatus) {
// throwable.getMessage:
// connection timed out: /1.1.1.1:8080
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 bb62a67b3..d0338d436 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,13 +16,9 @@
*/
package org.apache.servicecomb.core.exception.converter;
-import javax.annotation.Nullable;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import jakarta.ws.rs.core.Response.StatusType;
@@ -39,8 +35,6 @@ import jakarta.ws.rs.core.Response.StatusType;
* </pre>
*/
public class DefaultExceptionConverter implements
ExceptionConverter<Throwable> {
- private static final Logger LOGGER =
LoggerFactory.getLogger(DefaultExceptionConverter.class);
-
public static final int ORDER = Integer.MAX_VALUE;
@Override
@@ -54,7 +48,7 @@ public class DefaultExceptionConverter implements
ExceptionConverter<Throwable>
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
Throwable throwable, StatusType genericStatus) {
+ public InvocationException convert(Invocation invocation, Throwable
throwable, StatusType genericStatus) {
String msg = String.format("Unexpected exception when processing %s. %s",
invocation == null ? "none" :
invocation.getMicroserviceQualifiedName(), throwable.getMessage());
return new InvocationException(genericStatus,
ExceptionConverter.getGenericCode(genericStatus),
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 2d3247445..f80f1a825 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,13 +16,12 @@
*/
package org.apache.servicecomb.core.exception.converter;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
+import jakarta.ws.rs.core.Response.StatusType;
+
public class IllegalArgumentExceptionConverter implements
ExceptionConverter<IllegalArgumentException> {
public static final int ORDER = Short.MAX_VALUE;
@@ -37,7 +36,7 @@ public class IllegalArgumentExceptionConverter implements
ExceptionConverter<Ill
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
IllegalArgumentException throwable,
+ public InvocationException convert(Invocation invocation,
IllegalArgumentException throwable,
StatusType genericStatus) {
return new InvocationException(genericStatus,
ExceptionConverter.getGenericCode(genericStatus),
"Parameters not valid or types not match.", throwable);
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 8e5abfbe6..830aec319 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,13 +16,12 @@
*/
package org.apache.servicecomb.core.exception.converter;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
+import jakarta.ws.rs.core.Response.StatusType;
+
public class InvocationExceptionConverter implements
ExceptionConverter<InvocationException> {
public static final int ORDER = Byte.MAX_VALUE;
@@ -37,7 +36,7 @@ public class InvocationExceptionConverter implements
ExceptionConverter<Invocati
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
InvocationException throwable,
+ public InvocationException convert(Invocation invocation,
InvocationException throwable,
StatusType genericStatus) {
return throwable;
}
diff --git
a/core/src/main/java/org/apache/servicecomb/core/exception/converter/ServiceCombExceptionConverter.java
b/core/src/main/java/org/apache/servicecomb/core/exception/converter/ServiceCombExceptionConverter.java
index f6d0a2f90..9a69f4c98 100644
---
a/core/src/main/java/org/apache/servicecomb/core/exception/converter/ServiceCombExceptionConverter.java
+++
b/core/src/main/java/org/apache/servicecomb/core/exception/converter/ServiceCombExceptionConverter.java
@@ -19,15 +19,14 @@ package org.apache.servicecomb.core.exception.converter;
import java.util.concurrent.TimeoutException;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionConverter;
import
org.apache.servicecomb.foundation.common.exceptions.ServiceCombException;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.StatusType;
+
public class ServiceCombExceptionConverter implements
ExceptionConverter<ServiceCombException> {
public static final int ORDER = Byte.MAX_VALUE;
@@ -44,7 +43,7 @@ public class ServiceCombExceptionConverter implements
ExceptionConverter<Service
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
ServiceCombException throwable,
+ public InvocationException convert(Invocation invocation,
ServiceCombException throwable,
StatusType genericStatus) {
if (throwable.getCause() instanceof TimeoutException) {
return timeoutExceptionConverter.convert(invocation, (TimeoutException)
throwable.getCause(), genericStatus);
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 a5f070bed..31d48a829 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
@@ -20,15 +20,14 @@ import static
jakarta.ws.rs.core.Response.Status.REQUEST_TIMEOUT;
import java.util.concurrent.TimeoutException;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import jakarta.ws.rs.core.Response.StatusType;
+
public class TimeoutExceptionConverter implements
ExceptionConverter<TimeoutException> {
private static final Logger LOGGER =
LoggerFactory.getLogger(TimeoutExceptionConverter.class);
@@ -45,7 +44,7 @@ public class TimeoutExceptionConverter implements
ExceptionConverter<TimeoutExce
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
TimeoutException throwable,
+ public InvocationException convert(Invocation invocation, TimeoutException
throwable,
StatusType genericStatus) {
// throwable.getMessage:
// The timeout period of 30000ms has been exceeded while executing GET
/xxx for server 1.1.1.1:8080
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 9f89c7025..bd658be71 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
@@ -16,12 +16,9 @@
*/
package org.apache.servicecomb.core.filter;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.swagger.invocation.InvocationType;
public interface ConsumerFilter extends Filter {
- @Nonnull
@Override
default boolean enabledForInvocationType(InvocationType invocationType) {
return invocationType == InvocationType.CONSUMER;
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 5c58aca97..48e4e8ffc 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
@@ -18,8 +18,6 @@ package org.apache.servicecomb.core.filter;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.swagger.invocation.InvocationType;
import org.apache.servicecomb.swagger.invocation.Response;
@@ -70,7 +68,6 @@ public interface Filter {
return 0;
}
- @Nonnull
default String getName() {
throw new IllegalStateException("must provide unique filter name.");
}
diff --git
a/core/src/main/java/org/apache/servicecomb/core/filter/ProviderFilter.java
b/core/src/main/java/org/apache/servicecomb/core/filter/ProviderFilter.java
index 49ba1e481..7e1dbc318 100644
--- a/core/src/main/java/org/apache/servicecomb/core/filter/ProviderFilter.java
+++ b/core/src/main/java/org/apache/servicecomb/core/filter/ProviderFilter.java
@@ -16,12 +16,9 @@
*/
package org.apache.servicecomb.core.filter;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.swagger.invocation.InvocationType;
public interface ProviderFilter extends Filter {
- @Nonnull
@Override
default boolean enabledForInvocationType(InvocationType invocationType) {
return invocationType == InvocationType.PROVIDER;
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 2277b70f1..f611616b4 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,8 +18,6 @@ package org.apache.servicecomb.core.filter.impl;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
import org.apache.servicecomb.core.filter.FilterNode;
@@ -27,7 +25,6 @@ import org.apache.servicecomb.swagger.invocation.Response;
// just for test
public class EmptyFilter implements Filter {
- @Nonnull
@Override
public String getName() {
return "empty";
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 ea5cf5ffd..bce1b014d 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,8 +20,6 @@ import java.lang.reflect.Method;
import java.util.Set;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
import org.apache.servicecomb.core.filter.FilterNode;
@@ -63,7 +61,6 @@ public class ParameterValidatorFilter implements
ProviderFilter, InitializingBea
this.environment = environment;
}
- @Nonnull
@Override
public String getName() {
return NAME;
diff --git
a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProviderOperationFilter.java
b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProviderOperationFilter.java
index 1e450ebf4..bfd06f80e 100644
---
a/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProviderOperationFilter.java
+++
b/core/src/main/java/org/apache/servicecomb/core/filter/impl/ProviderOperationFilter.java
@@ -19,8 +19,6 @@ package org.apache.servicecomb.core.filter.impl;
import java.lang.reflect.Method;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.Exceptions;
import org.apache.servicecomb.core.filter.Filter;
@@ -35,7 +33,6 @@ import
org.apache.servicecomb.swagger.invocation.context.ContextUtils;
public class ProviderOperationFilter implements ProviderFilter {
public static final String NAME = "producer-operation";
- @Nonnull
@Override
public String getName() {
return NAME;
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 1f2c119c2..eaec70975 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,8 +19,6 @@ package org.apache.servicecomb.core.filter.impl;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.Executor;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.Exceptions;
import org.apache.servicecomb.core.filter.Filter;
@@ -33,7 +31,6 @@ import org.apache.servicecomb.swagger.invocation.Response;
public class ScheduleFilter implements ProviderFilter {
public static final String NAME = "schedule";
- @Nonnull
@Override
public String getName() {
return NAME;
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 c0fb69ffd..1d00932b2 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
@@ -35,8 +35,6 @@ import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.function.Supplier;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.SCBEngine;
import org.apache.servicecomb.core.definition.InvocationRuntimeType;
@@ -255,11 +253,11 @@ public final class InvokerUtils {
}
}
- public static boolean isSyncMethod(@Nonnull Method method) {
+ public static boolean isSyncMethod(Method method) {
return !isAsyncMethod(method);
}
- public static boolean isAsyncMethod(@Nonnull Method method) {
+ public static boolean isAsyncMethod(Method method) {
// currently only support CompletableFuture for async method definition
return method.getReturnType().equals(CompletableFuture.class);
}
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 978c8e23b..90ffc3c94 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
@@ -23,9 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
import java.util.Collections;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import
org.apache.servicecomb.foundation.test.scaffolding.exception.RuntimeExceptionWithoutStackTrace;
import org.apache.servicecomb.foundation.test.scaffolding.log.LogCollector;
@@ -34,6 +31,7 @@ import
org.apache.servicecomb.swagger.invocation.exception.InvocationException;
import org.junit.jupiter.api.Test;
import io.vertx.core.json.Json;
+import jakarta.ws.rs.core.Response.StatusType;
class ExceptionsTest {
@Test
@@ -82,7 +80,7 @@ class ExceptionsTest {
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
Throwable throwable, StatusType genericStatus) {
+ public InvocationException convert(Invocation invocation, Throwable
throwable, StatusType genericStatus) {
throw new RuntimeExceptionWithoutStackTrace("mock exception when
convert");
}
}
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 b162bfb1f..4eeb73026 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,8 +19,6 @@ package org.apache.servicecomb.core.filter;
import java.io.IOException;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.Exceptions;
import org.apache.servicecomb.swagger.invocation.InvocationType;
@@ -29,7 +27,6 @@ import org.apache.servicecomb.swagger.invocation.Response;
public class SimpleRetryFilter implements ConsumerFilter {
protected int maxRetry = 3;
- @Nonnull
@Override
public String getName() {
return "simple-retry";
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 ea328b627..9fd5aeec7 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,14 +17,13 @@
package org.apache.servicecomb.demo.edge.business.error;
-import javax.annotation.Nullable;
-import jakarta.ws.rs.core.Response.Status;
-import jakarta.ws.rs.core.Response.StatusType;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.exception.ExceptionConverter;
import org.apache.servicecomb.swagger.invocation.exception.InvocationException;
+import jakarta.ws.rs.core.Response.Status;
+import jakarta.ws.rs.core.Response.StatusType;
+
public class CustomExceptionToProducerResponseConverter implements
ExceptionConverter<IllegalStateException> {
@Override
@@ -38,7 +37,7 @@ public class CustomExceptionToProducerResponseConverter
implements
}
@Override
- public InvocationException convert(@Nullable Invocation invocation,
IllegalStateException e,
+ public InvocationException convert(Invocation invocation,
IllegalStateException e,
StatusType genericStatus) {
IllegalStateErrorData data = new IllegalStateErrorData();
data.setId(500);
diff --git
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/DecodeBodyFilter.java
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/DecodeBodyFilter.java
index 9e971e860..997ed53e6 100644
---
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/DecodeBodyFilter.java
+++
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/DecodeBodyFilter.java
@@ -19,8 +19,6 @@ package
org.apache.servicecomb.demo.edge.service.encrypt.filter;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
@@ -45,7 +43,6 @@ public class DecodeBodyFilter implements ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER - 1790;
}
- @Nonnull
@Override
public String getName() {
return "test-edge-decode-body";
diff --git
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java
index bbefe0bff..4e33f979a 100644
---
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java
+++
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureRequestFilter.java
@@ -22,8 +22,6 @@ import java.util.Comparator;
import java.util.List;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -49,7 +47,6 @@ public class EdgeSignatureRequestFilter implements
ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER - 1800;
}
- @Nonnull
@Override
public String getName() {
return "test-edge-signature-request";
diff --git
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureResponseFilter.java
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureResponseFilter.java
index 5d4d9ea38..0b0ae444a 100644
---
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureResponseFilter.java
+++
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/EdgeSignatureResponseFilter.java
@@ -19,8 +19,6 @@ package
org.apache.servicecomb.demo.edge.service.encrypt.filter;
import java.nio.charset.StandardCharsets;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -48,7 +46,6 @@ public class EdgeSignatureResponseFilter implements
ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER + 1991;
}
- @Nonnull
@Override
public String getName() {
return "test-edge-signature-request";
diff --git
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/UserIdFilter.java
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/UserIdFilter.java
index 49820941e..f6a54cacb 100644
---
a/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/UserIdFilter.java
+++
b/demo/demo-edge/edge-service/src/main/java/org/apache/servicecomb/demo/edge/service/encrypt/filter/UserIdFilter.java
@@ -18,8 +18,6 @@ package
org.apache.servicecomb.demo.edge.service.encrypt.filter;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -37,7 +35,6 @@ public class UserIdFilter implements ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER - 1790;
}
- @Nonnull
@Override
public String getName() {
return "test-edge-user-id";
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 a7838f2f8..3d1028998 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
@@ -19,8 +19,6 @@ package org.apache.servicecomb.demo.edge.service.handler;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -59,7 +57,6 @@ public class AuthHandler implements ConsumerFilter {
return true;
}
- @Nonnull
@Override
public String getName() {
return "test-auth";
diff --git
a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/handler/MyHandler.java
b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/handler/MyHandler.java
index 1f7673d6a..1ec59f40b 100644
---
a/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/handler/MyHandler.java
+++
b/demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/handler/MyHandler.java
@@ -19,8 +19,6 @@ package
org.apache.servicecomb.demo.springboot.pojo.server.handler;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
import org.apache.servicecomb.core.filter.FilterNode;
@@ -44,7 +42,6 @@ public class MyHandler implements ProviderFilter {
return Filter.PROVIDER_SCHEDULE_FILTER_ORDER - 100;
}
- @Nonnull
@Override
public String getName() {
return "test-my-filter";
diff --git
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/filter/ProviderTestFilter.java
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/filter/ProviderTestFilter.java
index 936f26838..8c0e1f3f4 100644
---
a/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/filter/ProviderTestFilter.java
+++
b/demo/demo-springmvc/springmvc-server/src/main/java/org/apache/servicecomb/demo/springmvc/filter/ProviderTestFilter.java
@@ -19,8 +19,6 @@ package org.apache.servicecomb.demo.springmvc.filter;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
import org.apache.servicecomb.core.filter.FilterNode;
@@ -36,7 +34,6 @@ public class ProviderTestFilter implements ProviderFilter {
return Filter.PROVIDER_SCHEDULE_FILTER_ORDER - 1800;
}
- @Nonnull
@Override
public String getName() {
return "test-provider";
diff --git a/dependencies/default/pom.xml b/dependencies/default/pom.xml
index b52f04889..a4881cacf 100644
--- a/dependencies/default/pom.xml
+++ b/dependencies/default/pom.xml
@@ -191,18 +191,6 @@
<version>${protobuf.version}</version>
</dependency>
- <dependency>
- <groupId>com.netflix.archaius</groupId>
- <artifactId>archaius-core</artifactId>
- <version>${archaius.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>annotations</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>com.netflix.governator</groupId>
<artifactId>governator-annotations</artifactId>
@@ -214,12 +202,6 @@
<version>${governator-api.version}</version>
</dependency>
- <dependency>
- <groupId>com.netflix.hystrix</groupId>
- <artifactId>hystrix-core</artifactId>
- <version>${hystrix.version}</version>
- </dependency>
-
<dependency>
<groupId>com.netflix.netflix-commons</groupId>
<artifactId>netflix-eventbus</artifactId>
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 0788397e5..5ba63b04a 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
@@ -22,8 +22,6 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.function.BiConsumer;
-import javax.annotation.Nonnull;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.config.ConfigurationChangedEvent;
import org.apache.servicecomb.core.Invocation;
@@ -83,7 +81,6 @@ public class EdgeAddHeaderFilter implements ConsumerFilter {
}
}
- @Nonnull
@Override
public String getName() {
return NAME;
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 416672ea5..cef9257b3 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
@@ -18,8 +18,6 @@ package org.apache.servicecomb.edge.core;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.common.rest.filter.inner.RestServerCodecFilter;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
@@ -31,13 +29,11 @@ import
org.apache.servicecomb.swagger.invocation.context.TransportContext;
public class EdgeServerCodecFilter extends RestServerCodecFilter {
public static final String NAME = "edge-server-codec";
- @Nonnull
@Override
public String getName() {
return NAME;
}
- @Nonnull
@Override
public boolean enabledForInvocationType(InvocationType invocationType) {
return invocationType == InvocationType.CONSUMER;
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 b575ec33c..be17eee86 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,8 +17,6 @@
package org.apache.servicecomb.config.priority;
-import javax.annotation.Nullable;
-
import org.apache.servicecomb.foundation.common.utils.bean.Setter;
/**
@@ -34,7 +32,7 @@ public class ConfigObjectProperty {
this.property = property;
}
- public void updateValueWhenChanged(Object instance, @Nullable String
changedKey) {
+ public void updateValueWhenChanged(Object instance, String changedKey) {
if (property.isChangedKey(changedKey)) {
property.updateValue();
setter.set(instance, property.getValue());
diff --git
a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/DynamicPropertiesTest.java
b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/DynamicPropertiesTest.java
index 4b2de1c79..ecf7bf779 100644
---
a/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/DynamicPropertiesTest.java
+++
b/foundations/foundation-config/src/test/java/org/apache/servicecomb/config/DynamicPropertiesTest.java
@@ -33,13 +33,9 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.springframework.core.env.Environment;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DynamicPropertyFactory;
import com.seanyinx.github.unit.scaffolding.Poller;
import com.seanyinx.github.unit.scaffolding.Randomness;
-import mockit.Deencapsulation;
-
public class DynamicPropertiesTest {
private static final String stringPropertyName =
uniquify("stringPropertyName");
@@ -95,9 +91,7 @@ public class DynamicPropertiesTest {
@AfterClass
public static void tearDown() throws Exception {
- Deencapsulation.setField(ConfigurationManager.class, "instance", null);
- Deencapsulation.setField(ConfigurationManager.class,
"customConfigurationInstalled", false);
- Deencapsulation.setField(DynamicPropertyFactory.class, "config", null);
+
}
private static void writeInitialConfig() throws Exception {
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 632de7bc0..3a1aad264 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,8 +16,6 @@
*/
package org.apache.servicecomb.foundation.protobuf.internal.parser;
-import javax.annotation.Nullable;
-
import org.antlr.v4.runtime.CharStream;
import org.antlr.v4.runtime.CharStreams;
@@ -25,6 +23,7 @@ import io.protostuff.compiler.parser.FileReader;
public class ContentFileReader implements FileReader {
private final FileReader importReader;
+
private final String content;
private boolean contentReaded;
@@ -34,7 +33,6 @@ public class ContentFileReader implements FileReader {
this.content = content;
}
- @Nullable
@Override
public CharStream read(String contentOrName) {
if (!contentReaded) {
diff --git a/foundations/foundation-test-scaffolding/pom.xml
b/foundations/foundation-test-scaffolding/pom.xml
index 44523a196..201d814b0 100644
--- a/foundations/foundation-test-scaffolding/pom.xml
+++ b/foundations/foundation-test-scaffolding/pom.xml
@@ -31,10 +31,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</dependency>
- <dependency>
- <groupId>com.netflix.archaius</groupId>
- <artifactId>archaius-core</artifactId>
- </dependency>
<dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
diff --git
a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/config/ArchaiusUtils.java
b/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/config/ArchaiusUtils.java
deleted file mode 100644
index be347046d..000000000
---
a/foundations/foundation-test-scaffolding/src/main/java/org/apache/servicecomb/foundation/test/scaffolding/config/ArchaiusUtils.java
+++ /dev/null
@@ -1,83 +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.foundation.test.scaffolding.config;
-
-import java.lang.reflect.Field;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.springframework.util.ReflectionUtils;
-
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DynamicProperty;
-import com.netflix.config.DynamicPropertyFactory;
-
-public final class ArchaiusUtils {
- private static final Field FIELD_INSTANCE =
ReflectionUtils.findField(ConfigurationManager.class, "instance");
-
- private static final Field FIELD_CUSTOM_CONFIGURATION_INSTALLED =
- ReflectionUtils.findField(ConfigurationManager.class,
"customConfigurationInstalled");
-
- private static final Field FIELD_CONFIG =
ReflectionUtils.findField(DynamicPropertyFactory.class, "config");
-
- private static final Field FIELD_INITIALIZED_WITH_DEFAULT_CONFIG =
- ReflectionUtils.findField(DynamicPropertyFactory.class,
"initializedWithDefaultConfig");
-
- private static final Field FIELD_DYNAMIC_PROPERTY_SUPPORTIMPL =
- ReflectionUtils.findField(DynamicProperty.class,
"dynamicPropertySupportImpl");
-
- private static final Field FIELD_DYNAMIC_PROPERTY_ALL_PROPS = ReflectionUtils
- .findField(DynamicProperty.class, "ALL_PROPS");
-
- static {
- FIELD_INSTANCE.setAccessible(true);
- FIELD_CUSTOM_CONFIGURATION_INSTALLED.setAccessible(true);
- FIELD_CONFIG.setAccessible(true);
- FIELD_INITIALIZED_WITH_DEFAULT_CONFIG.setAccessible(true);
- FIELD_DYNAMIC_PROPERTY_SUPPORTIMPL.setAccessible(true);
- FIELD_DYNAMIC_PROPERTY_ALL_PROPS.setAccessible(true);
- }
-
- private ArchaiusUtils() {
- }
-
- @SuppressWarnings("unchecked")
- public static void resetConfig() {
- ReflectionUtils.setField(FIELD_INSTANCE, null, null);
- ReflectionUtils.setField(FIELD_CUSTOM_CONFIGURATION_INSTALLED, null,
false);
- ReflectionUtils.setField(FIELD_CONFIG, null, null);
- ReflectionUtils.setField(FIELD_INITIALIZED_WITH_DEFAULT_CONFIG, null,
false);
- ReflectionUtils.setField(FIELD_DYNAMIC_PROPERTY_SUPPORTIMPL, null, null);
- ((ConcurrentHashMap<String, DynamicProperty>)
ReflectionUtils.getField(FIELD_DYNAMIC_PROPERTY_ALL_PROPS, null))
- .clear();
- }
-
- public static void setProperty(String key, Object value) {
- // ensure have instance
- DynamicPropertyFactory.getInstance();
-
- ConcurrentCompositeConfiguration config =
(ConcurrentCompositeConfiguration) DynamicPropertyFactory
- .getBackingConfigurationSource();
- if (value != null) {
- config.getConfiguration(0).setProperty(key, value);
- return;
- }
-
- config.getConfiguration(0).clearProperty(key);
- }
-}
diff --git
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerAbortFaultFilter.java
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerAbortFaultFilter.java
index 25c8f7799..c13f1b8c2 100644
---
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerAbortFaultFilter.java
+++
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerAbortFaultFilter.java
@@ -18,8 +18,6 @@ package org.apache.servicecomb.faultinjection;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -43,7 +41,6 @@ public class ConsumerAbortFaultFilter implements
ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER + 1020;
}
- @Nonnull
@Override
public String getName() {
return "consumer-abort-fault";
diff --git
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerDelayFaultFilter.java
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerDelayFaultFilter.java
index 7503be81f..248ed748c 100644
---
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerDelayFaultFilter.java
+++
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/ConsumerDelayFaultFilter.java
@@ -18,8 +18,6 @@ package org.apache.servicecomb.faultinjection;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -40,7 +38,6 @@ public class ConsumerDelayFaultFilter implements
ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER + 1030;
}
- @Nonnull
@Override
public String getName() {
return "consumer-delay-fault";
diff --git
a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerFlowControlFilter.java
b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerFlowControlFilter.java
index 749514aae..b5fe884d9 100644
---
a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerFlowControlFilter.java
+++
b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ConsumerFlowControlFilter.java
@@ -19,8 +19,6 @@ package org.apache.servicecomb.qps;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -50,7 +48,6 @@ public class ConsumerFlowControlFilter implements
ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER - 1990;
}
- @Nonnull
@Override
public String getName() {
return "consumer-flow-control";
diff --git
a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ProviderFlowControlFilter.java
b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ProviderFlowControlFilter.java
index c941f2900..ef9610d30 100644
---
a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ProviderFlowControlFilter.java
+++
b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/ProviderFlowControlFilter.java
@@ -19,8 +19,6 @@ package org.apache.servicecomb.qps;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
@@ -46,7 +44,6 @@ public class ProviderFlowControlFilter implements
ProviderFilter {
return Filter.PROVIDER_SCHEDULE_FILTER_ORDER - 1990;
}
- @Nonnull
@Override
public String getName() {
return "provider-flow-control";
diff --git
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceBulkheadFilter.java
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceBulkheadFilter.java
index 33db08c5a..8d8fd4c94 100644
---
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceBulkheadFilter.java
+++
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceBulkheadFilter.java
@@ -21,9 +21,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Supplier;
-import javax.annotation.Nonnull;
-import jakarta.ws.rs.core.Response.Status;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -43,6 +40,7 @@ import io.github.resilience4j.bulkhead.Bulkhead;
import io.github.resilience4j.bulkhead.BulkheadFullException;
import io.github.resilience4j.decorators.Decorators;
import io.github.resilience4j.decorators.Decorators.DecorateCompletionStage;
+import jakarta.ws.rs.core.Response.Status;
public class ConsumerInstanceBulkheadFilter implements ConsumerFilter {
private static final Logger LOGGER =
LoggerFactory.getLogger(ConsumerInstanceBulkheadFilter.class);
@@ -59,7 +57,6 @@ public class ConsumerInstanceBulkheadFilter implements
ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER + 1060;
}
- @Nonnull
@Override
public String getName() {
return "instance-bulkhead";
diff --git
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationFilter.java
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationFilter.java
index a2eca3457..875e53b75 100644
---
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationFilter.java
+++
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ConsumerInstanceIsolationFilter.java
@@ -22,8 +22,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Supplier;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
import org.apache.servicecomb.core.filter.Filter;
@@ -69,7 +67,6 @@ public class ConsumerInstanceIsolationFilter implements
ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER + 1050;
}
- @Nonnull
@Override
public String getName() {
return "instance-isolation";
diff --git
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderBulkheadFilter.java
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderBulkheadFilter.java
index 4bfaf3af9..c526916b0 100644
---
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderBulkheadFilter.java
+++
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderBulkheadFilter.java
@@ -21,8 +21,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Supplier;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
import org.apache.servicecomb.core.filter.FilterNode;
@@ -58,7 +56,6 @@ public class ProviderBulkheadFilter implements ProviderFilter
{
return Filter.PROVIDER_SCHEDULE_FILTER_ORDER - 1880;
}
- @Nonnull
@Override
public String getName() {
return "provider-bulkhead";
diff --git
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderCircuitBreakerFilter.java
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderCircuitBreakerFilter.java
index a85b53372..0c5e2ed33 100644
---
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderCircuitBreakerFilter.java
+++
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderCircuitBreakerFilter.java
@@ -21,8 +21,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Supplier;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
import org.apache.servicecomb.core.filter.FilterNode;
@@ -58,7 +56,6 @@ public class ProviderCircuitBreakerFilter implements
ProviderFilter {
return Filter.PROVIDER_SCHEDULE_FILTER_ORDER - 1890;
}
- @Nonnull
@Override
public String getName() {
return "provider-circuit-breaker";
diff --git
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderRateLimitingFilter.java
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderRateLimitingFilter.java
index f72e2c279..63db4cd7d 100644
---
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderRateLimitingFilter.java
+++
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/ProviderRateLimitingFilter.java
@@ -21,8 +21,6 @@ import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CompletionStage;
import java.util.function.Supplier;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
import org.apache.servicecomb.core.filter.FilterNode;
@@ -58,7 +56,6 @@ public class ProviderRateLimitingFilter implements
ProviderFilter {
return Filter.PROVIDER_SCHEDULE_FILTER_ORDER - 1900;
}
- @Nonnull
@Override
public String getName() {
return "provider-rate-limiting";
diff --git
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceFilter.java
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceFilter.java
index 14579612c..32911bc7c 100644
---
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceFilter.java
+++
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceFilter.java
@@ -21,8 +21,6 @@ import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.core.Endpoint;
import org.apache.servicecomb.core.Invocation;
@@ -113,7 +111,6 @@ public class LoadBalanceFilter implements ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER;
}
- @Nonnull
@Override
public String getName() {
return "load-balance";
diff --git
a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthFilter.java
b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthFilter.java
index 27d54e504..6957dc1b7 100644
---
a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthFilter.java
+++
b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/consumer/ConsumerAuthFilter.java
@@ -19,8 +19,6 @@ package org.apache.servicecomb.authentication.consumer;
import java.util.Optional;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
@@ -46,7 +44,6 @@ public class ConsumerAuthFilter implements ConsumerFilter {
return Filter.CONSUMER_LOAD_BALANCE_ORDER + 1010;
}
- @Nonnull
@Override
public String getName() {
return "consumer-public-key";
diff --git
a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/ProviderAuthFilter.java
b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/ProviderAuthFilter.java
index ddfda036e..053745016 100644
---
a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/ProviderAuthFilter.java
+++
b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/provider/ProviderAuthFilter.java
@@ -18,8 +18,6 @@ package org.apache.servicecomb.authentication.provider;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
@@ -45,7 +43,6 @@ public class ProviderAuthFilter implements ProviderFilter {
return Filter.PROVIDER_SCHEDULE_FILTER_ORDER + 1010;
}
- @Nonnull
@Override
public String getName() {
return "provider-public-key";
diff --git
a/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/RouterAddHeaderFilter.java
b/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/RouterAddHeaderFilter.java
index 4d044f2e9..bf7dbeb7e 100644
---
a/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/RouterAddHeaderFilter.java
+++
b/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/RouterAddHeaderFilter.java
@@ -23,8 +23,6 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.Filter;
@@ -92,7 +90,6 @@ public class RouterAddHeaderFilter implements Filter {
return true;
}
- @Nonnull
@Override
public String getName() {
return "router-add-header";
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 2d53510c3..a646d2ded 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,8 +21,6 @@ import static
org.apache.servicecomb.core.provider.consumer.InvokerUtils.isAsync
import java.lang.reflect.Method;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.provider.consumer.InvokerUtils;
import org.apache.servicecomb.swagger.invocation.exception.ExceptionFactory;
@@ -38,7 +36,7 @@ public class FilterInvocationCaller implements
InvocationCaller {
return isAsyncMethod(method) ? future : InvokerUtils.toSync(future,
invocation.getWaitTime());
}
- protected CompletableFuture<Object> doCall(@Nonnull PojoInvocation
invocation) {
+ protected CompletableFuture<Object> doCall(PojoInvocation invocation) {
return InvokerUtils.invoke(invocation)
.thenApply(response -> {
if (response.isSucceed()) {
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 336f0d46d..1de414759 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,8 +20,6 @@ import java.lang.reflect.Method;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.definition.MicroserviceMeta;
import org.apache.servicecomb.core.definition.OperationMeta;
import org.apache.servicecomb.core.definition.SchemaMeta;
@@ -67,7 +65,6 @@ public class PojoConsumerMeta {
return schemaMeta;
}
- @Nonnull
public PojoConsumerOperationMeta ensureFindOperationMeta(Method method) {
PojoConsumerOperationMeta pojoConsumerOperationMeta =
operationMetas.get(method);
if (pojoConsumerOperationMeta == null) {
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 c50ebfcd9..82d0348c4 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,8 +18,6 @@ package org.apache.servicecomb.transport.highway;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf;
import org.apache.servicecomb.codec.protobuf.definition.ProtobufManager;
import org.apache.servicecomb.core.CoreConst;
@@ -41,7 +39,6 @@ public class HighwayClientFilter implements ConsumerFilter {
public static final String NAME = "highway-client";
- @Nonnull
@Override
public String getName() {
return NAME;
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 d59b2da8f..87d620156 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,8 +20,6 @@ import static
org.apache.servicecomb.core.exception.Exceptions.toProducerRespons
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf;
import org.apache.servicecomb.codec.protobuf.definition.ResponseRootSerializer;
import org.apache.servicecomb.core.CoreConst;
@@ -39,7 +37,6 @@ import io.vertx.core.buffer.Buffer;
public class HighwayServerCodecFilter implements ProviderFilter {
public static final String NAME = "highway-server-codec";
- @Nonnull
@Override
public String getName() {
return NAME;
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 340f84595..9f3c89152 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
@@ -19,8 +19,6 @@ package org.apache.servicecomb.transport.rest.client;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.common.rest.RestConst;
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.Invocation;
@@ -42,7 +40,6 @@ public class RestClientCodecFilter implements ConsumerFilter {
protected RestClientDecoder decoder;
- @Nonnull
@Override
public String getName() {
return NAME;
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 c3c460c87..b9c1e16a1 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
@@ -26,9 +26,6 @@ import java.nio.charset.StandardCharsets;
import java.util.Map;
import java.util.Map.Entry;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
import org.apache.servicecomb.common.rest.codec.RestCodec;
import org.apache.servicecomb.common.rest.codec.RestObjectMapperFactory;
import org.apache.servicecomb.common.rest.codec.query.QueryCodec;
@@ -103,7 +100,7 @@ public class RestClientEncoder {
.argsToRest(invocation.getSwaggerArguments(),
transportContext.getRestOperationMeta(), requestParameters);
}
- protected void writeCookies(@Nullable Map<String, String> cookieMap) {
+ protected void writeCookies(Map<String, String> cookieMap) {
if (CollectionUtils.isEmpty(cookieMap)) {
return;
}
@@ -130,7 +127,7 @@ public class RestClientEncoder {
RestObjectMapperFactory.getRestObjectMapper().writeValueAsString(invocation.getContext()));
}
- protected void writeForm(@Nullable Map<String, Object> formMap) throws
Exception {
+ protected void writeForm(Map<String, Object> formMap) throws Exception {
if (requestParameters.getUploads() == null) {
writeUrlEncodedForm(formMap);
return;
@@ -139,7 +136,7 @@ public class RestClientEncoder {
writeChunkedForm(formMap);
}
- protected void writeUrlEncodedForm(@Nullable Map<String, Object> formMap)
throws Exception {
+ protected void writeUrlEncodedForm(Map<String, Object> formMap) throws
Exception {
if (formMap == null) {
return;
}
@@ -150,7 +147,7 @@ public class RestClientEncoder {
requestParameters.setBodyBuffer(bodyBuffer);
}
- protected Buffer genUrlEncodedFormBuffer(@Nonnull Map<String, Object>
formMap) throws Exception {
+ protected Buffer genUrlEncodedFormBuffer(Map<String, Object> formMap)
throws Exception {
// 2x faster than UriComponentsBuilder
ByteBuf byteBuf = Unpooled.buffer(RestClientEncoder.FORM_BUFFER_SIZE);
for (Entry<String, Object> entry : formMap.entrySet()) {
@@ -169,7 +166,7 @@ public class RestClientEncoder {
return Buffer.buffer(byteBuf);
}
- protected void writeChunkedForm(@Nullable Map<String, Object> formMap)
throws Exception {
+ protected void writeChunkedForm(Map<String, Object> formMap) throws
Exception {
String boundary = transportContext.getOrCreateBoundary();
httpClientRequest.setChunked(true);
@@ -183,7 +180,7 @@ public class RestClientEncoder {
requestParameters.setBodyBuffer(bodyBuffer);
}
- protected Buffer genChunkedFormBuffer(@Nonnull Map<String, Object>
formMap, String boundary) throws Exception {
+ protected Buffer genChunkedFormBuffer(Map<String, Object> formMap, String
boundary) throws Exception {
ByteBuf byteBuf = Unpooled.buffer(RestClientEncoder.FORM_BUFFER_SIZE);
for (Entry<String, Object> entry : formMap.entrySet()) {
writeCharSequence(byteBuf, "\r\n--");
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 b09eb02fb..53d9de772 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,9 +20,6 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
-import javax.annotation.Nonnull;
-import jakarta.servlet.http.Part;
-
import org.apache.servicecomb.foundation.common.utils.PartUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,6 +29,7 @@ import com.google.common.collect.Multimap;
import io.vertx.core.MultiMap;
import io.vertx.core.buffer.Buffer;
+import jakarta.servlet.http.Part;
public class RestClientRequestParametersImpl implements
RestClientRequestParameters {
private static final Logger LOGGER =
LoggerFactory.getLogger(RestClientRequestParametersImpl.class);
@@ -46,7 +44,7 @@ public class RestClientRequestParametersImpl implements
RestClientRequestParamet
protected Buffer bodyBuffer;
- public RestClientRequestParametersImpl(@Nonnull MultiMap headers) {
+ public RestClientRequestParametersImpl(MultiMap headers) {
this.headers = headers;
}
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 34764effb..8ee02c360 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,8 +18,6 @@ package org.apache.servicecomb.transport.rest.client;
import java.util.concurrent.CompletableFuture;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.core.CoreConst;
import org.apache.servicecomb.core.Invocation;
import org.apache.servicecomb.core.filter.ConsumerFilter;
@@ -31,7 +29,6 @@ import org.apache.servicecomb.swagger.invocation.Response;
public class RestClientSenderFilter implements ConsumerFilter {
public static final String NAME = "rest-client-sender";
- @Nonnull
@Override
public String getName() {
return NAME;
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 a12ee8cc0..1b31cf953 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,8 +16,6 @@
*/
package org.apache.servicecomb.transport.rest.servlet;
-import javax.annotation.Nonnull;
-
import org.apache.servicecomb.common.rest.HttpTransportContext;
import org.apache.servicecomb.common.rest.RestProducerInvocationCreator;
import org.apache.servicecomb.core.Endpoint;
@@ -27,8 +25,8 @@ import
org.apache.servicecomb.foundation.vertx.http.HttpServletRequestEx;
import org.apache.servicecomb.foundation.vertx.http.HttpServletResponseEx;
public class RestServletProducerInvocationCreator extends
RestProducerInvocationCreator {
- public RestServletProducerInvocationCreator(@Nonnull MicroserviceMeta
microserviceMeta, @Nonnull Endpoint endpoint,
- @Nonnull HttpServletRequestEx requestEx, @Nonnull HttpServletResponseEx
responseEx) {
+ public RestServletProducerInvocationCreator(MicroserviceMeta
microserviceMeta, Endpoint endpoint,
+ HttpServletRequestEx requestEx, HttpServletResponseEx responseEx) {
super(microserviceMeta, endpoint, requestEx, responseEx);
}
