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
The following commit(s) were added to refs/heads/master by this push:
new ad242f4e6 Improve bean name to avoid conflicts with other frameworks
(#4602)
ad242f4e6 is described below
commit ad242f4e61c11d9ccaf498be9ce5bb485912927d
Author: liubao68 <[email protected]>
AuthorDate: Fri Nov 22 09:52:59 2024 +0800
Improve bean name to avoid conflicts with other frameworks (#4602)
---
.../common/accessLog/AccessLogConfiguration.java | 2 +-
.../common/rest/CommonRestConfiguration.java | 18 ++---
.../core/ServiceCombCoreConfiguration.java | 24 +++----
.../core/exception/CoreExceptionConfiguration.java | 4 +-
.../core/filter/CoreFilterConfiguration.java | 12 ++--
.../invocation/CoreInvocationConfiguration.java | 6 +-
.../edge/core/EdgeCoreConfiguration.java | 4 +-
.../auth/FoundationCommonAuthConfiguration.java | 2 +-
.../foundation/common/event/EventManager.java | 2 +-
.../config/FoundationConfigConfiguration.java | 14 ++--
.../registry/RegistryConfiguration.java | 14 ++--
.../governance/GovernanceCommonConfiguration.java | 84 +++++++++++-----------
.../governance/marker/RequestProcessor.java | 8 +--
.../marker/operator/CompareOperator.java | 5 ++
.../marker/operator/ContainsOperator.java | 5 ++
.../governance/marker/operator/ExactOperator.java | 5 ++
.../governance/marker/operator/MatchOperator.java | 1 +
.../governance/marker/operator/PrefixOperator.java | 5 ++
.../governance/marker/operator/SuffixOperator.java | 5 ++
.../router/RouterCommonConfiguration.java | 6 +-
.../governance/BulkheadHandlerTest.java | 4 +-
.../servicecomb/governance/FaultInjectionTest.java | 4 +-
.../governance/GovernancePropertiesTest.java | 36 +++++-----
.../apache/servicecomb/governance/MapperTest.java | 4 +-
.../FaultInjectionConfiguration.java | 4 +-
.../qps/FlowControlQpsConfiguration.java | 4 +-
.../governance/HandlerGovernanceConfiguration.java | 10 +--
.../loadbalance/LoadBalanceConfiguration.java | 14 ++--
.../AuthenticationConfiguration.java | 12 ++--
.../custom/ServiceCombRouterConfiguration.java | 2 +-
.../tracing/zipkin/TracingConfiguration.java | 12 ++--
.../dashboard/monitor/DashboardConfiguration.java | 12 ++--
.../metrics/core/publish/DefaultLogPublisher.java | 10 +--
.../swagger/engine/SwaggerEnvironment.java | 14 ++--
...rFactorys.java => ResponseMapperFactories.java} | 10 +--
.../invocation/response/ResponseMapperFactory.java | 2 +-
...letableFutureConsumerResponseMapperFactory.java | 4 +-
.../CseResponseConsumerResponseMapperFactory.java | 4 +-
.../DefaultConsumerResponseMapperFactory.java | 4 +-
.../OptionalConsumerResponseMapperFactory.java | 4 +-
...letableFutureProducerResponseMapperFactory.java | 4 +-
.../CseResponseProducerResponseMapperFactory.java | 4 +-
.../DefaultProducerResponseMapperFactory.java | 4 +-
.../OptionalProducerResponseMapperFactory.java | 4 +-
...va => TestConsumerResponseMapperFactories.java} | 2 +-
...va => TestProducerResponseMapperFactories.java} | 2 +-
.../JaxrsConsumerResponseMapperFactory.java | 4 +-
.../JaxrsProducerResponseMapperFactory.java | 4 +-
.../SpringmvcConsumerResponseMapperFactory.java | 4 +-
.../SpringmvcProducerResponseMapperFactory.java | 4 +-
...TestSpringmvcProducerResponseMapperFactory.java | 4 +-
51 files changed, 231 insertions(+), 205 deletions(-)
diff --git
a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/AccessLogConfiguration.java
b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/AccessLogConfiguration.java
index cb5e92a20..abbb90adc 100644
---
a/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/AccessLogConfiguration.java
+++
b/common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/AccessLogConfiguration.java
@@ -22,7 +22,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class AccessLogConfiguration {
@Bean
- public AccessLogBootListener accessLogBootListener() {
+ public AccessLogBootListener scbAccessLogBootListener() {
return new AccessLogBootListener();
}
}
diff --git
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/CommonRestConfiguration.java
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/CommonRestConfiguration.java
index 655c9b4f8..a642265ae 100644
---
a/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/CommonRestConfiguration.java
+++
b/common/common-rest/src/main/java/org/apache/servicecomb/common/rest/CommonRestConfiguration.java
@@ -33,47 +33,47 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class CommonRestConfiguration {
@Bean
- public QueryCodecCsv queryCodecCsv() {
+ public QueryCodecCsv scbQueryCodecCsv() {
return new QueryCodecCsv();
}
@Bean
- public QueryCodecSsv queryCodecSsv() {
+ public QueryCodecSsv scbQueryCodecSsv() {
return new QueryCodecSsv();
}
@Bean
- public QueryCodecPipes queryCodecPipes() {
+ public QueryCodecPipes scbQueryCodecPipes() {
return new QueryCodecPipes();
}
@Bean
- public QueryCodecMulti queryCodecMulti() {
+ public QueryCodecMulti scbQueryCodecMulti() {
return new QueryCodecMulti();
}
@Bean
- public QueryCodecsUtils queryCodecsUtils(QueryCodecs queryCodecs) {
+ public QueryCodecsUtils scbQueryCodecsUtils(QueryCodecs queryCodecs) {
return new QueryCodecsUtils(queryCodecs);
}
@Bean
- public RestServerCodecFilter restServerCodecFilter() {
+ public RestServerCodecFilter scbRestServerCodecFilter() {
return new RestServerCodecFilter();
}
@Bean
- public WebSocketServerCodecFilter webSocketServerCodecFilter() {
+ public WebSocketServerCodecFilter scbWebSocketServerCodecFilter() {
return new WebSocketServerCodecFilter();
}
@Bean
- public QueryCodecs queryCodecs(List<QueryCodec> orderedCodecs) {
+ public QueryCodecs scbQueryCodecs(List<QueryCodec> orderedCodecs) {
return new QueryCodecs(orderedCodecs);
}
@Bean
- public RestEngineSchemaListener restEngineSchemaListener() {
+ public RestEngineSchemaListener scbRestEngineSchemaListener() {
return new RestEngineSchemaListener();
}
}
diff --git
a/core/src/main/java/org/apache/servicecomb/core/ServiceCombCoreConfiguration.java
b/core/src/main/java/org/apache/servicecomb/core/ServiceCombCoreConfiguration.java
index 8ea9f726c..8abaceef9 100644
---
a/core/src/main/java/org/apache/servicecomb/core/ServiceCombCoreConfiguration.java
+++
b/core/src/main/java/org/apache/servicecomb/core/ServiceCombCoreConfiguration.java
@@ -49,65 +49,65 @@ public class ServiceCombCoreConfiguration {
}
@Bean
- public ConsumerProviderManager consumerProviderManager(Environment
environment,
+ public ConsumerProviderManager scbConsumerProviderManager(Environment
environment,
OpenAPIRegistryManager openAPIRegistryManager) {
return new ConsumerProviderManager(environment, openAPIRegistryManager);
}
@Bean
- public ReferenceConfigManager referenceConfigManager() {
+ public ReferenceConfigManager scbReferenceConfigManager() {
return new ReferenceConfigManager();
}
@Bean
- public OpenAPIRegistryManager openAPIRegistryManager() {
+ public OpenAPIRegistryManager scbOpenAPIRegistryManager() {
return new OpenAPIRegistryManager();
}
@Bean
- public LocalOpenAPIRegistry localOpenAPIRegistry(Environment environment) {
+ public LocalOpenAPIRegistry scbLocalOpenAPIRegistry(Environment environment)
{
return new LocalOpenAPIRegistry(environment);
}
@Bean
- public RegistryOpenAPIRegistry registryOpenAPIRegistry() {
+ public RegistryOpenAPIRegistry scbRegistryOpenAPIRegistry() {
return new RegistryOpenAPIRegistry();
}
@Bean
- public ProducerBootListener producerBootListener() {
+ public ProducerBootListener scbProducerBootListener() {
return new ProducerBootListener();
}
@Bean
- public FilterChainCollector filterChainCollector() {
+ public FilterChainCollector scbFilterChainCollector() {
return new FilterChainCollector();
}
@Bean
- public ConfigurationProblemsCollector configurationProblemsCollector() {
+ public ConfigurationProblemsCollector scbConfigurationProblemsCollector() {
return new ConfigurationProblemsCollector();
}
@Bean
- public ServiceInformationCollector serviceInformationCollector() {
+ public ServiceInformationCollector scbServiceInformationCollector() {
return new ServiceInformationCollector();
}
@Bean
- public ExecutorManager executorManager() {
+ public ExecutorManager scbExecutorManager() {
return new ExecutorManager();
}
@Bean(value = {"cse.executor.groupThreadPool", "cse.executor.default",
"servicecomb.executor.groupThreadPool"})
- public GroupExecutor groupExecutor(Environment environment) {
+ public GroupExecutor scbGroupExecutor(Environment environment) {
GroupExecutor groupExecutor = new GroupExecutor(environment);
groupExecutor.init();
return groupExecutor;
}
@Bean
- public TransportManager transportManager() {
+ public TransportManager scbTransportManager() {
return new TransportManager();
}
}
diff --git
a/core/src/main/java/org/apache/servicecomb/core/exception/CoreExceptionConfiguration.java
b/core/src/main/java/org/apache/servicecomb/core/exception/CoreExceptionConfiguration.java
index f10692bd5..856888764 100644
---
a/core/src/main/java/org/apache/servicecomb/core/exception/CoreExceptionConfiguration.java
+++
b/core/src/main/java/org/apache/servicecomb/core/exception/CoreExceptionConfiguration.java
@@ -22,12 +22,12 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class CoreExceptionConfiguration {
@Bean
- public Exceptions exceptions() {
+ public Exceptions scbExceptions() {
return new Exceptions();
}
@Bean
- public DefaultExceptionProcessor defaultExceptionProcessor() {
+ public DefaultExceptionProcessor scbDefaultExceptionProcessor() {
return new DefaultExceptionProcessor();
}
}
diff --git
a/core/src/main/java/org/apache/servicecomb/core/filter/CoreFilterConfiguration.java
b/core/src/main/java/org/apache/servicecomb/core/filter/CoreFilterConfiguration.java
index d0a734c03..0d9ce4026 100644
---
a/core/src/main/java/org/apache/servicecomb/core/filter/CoreFilterConfiguration.java
+++
b/core/src/main/java/org/apache/servicecomb/core/filter/CoreFilterConfiguration.java
@@ -29,32 +29,32 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class CoreFilterConfiguration {
@Bean
- public ProviderOperationFilter producerOperationFilter() {
+ public ProviderOperationFilter scbProducerOperationFilter() {
return new ProviderOperationFilter();
}
@Bean
- public ScheduleFilter scheduleFilter() {
+ public ScheduleFilter scbScheduleFilter() {
return new ScheduleFilter();
}
@Bean
- public RetryFilter retryFilter(RetryHandler retryHandler) {
+ public RetryFilter scbRetryFilter(RetryHandler retryHandler) {
return new RetryFilter(retryHandler);
}
@Bean
- public ContextMapperFilter contextMapperFilter(MapperHandler mapperHandler) {
+ public ContextMapperFilter scbContextMapperFilter(MapperHandler
mapperHandler) {
return new ContextMapperFilter(mapperHandler);
}
@Bean
- public FilterChainsManager filterChainsManager() {
+ public FilterChainsManager scbFilterChainsManager() {
return new FilterChainsManager();
}
@Bean
- public ParameterValidatorFilter parameterValidatorFilter() {
+ public ParameterValidatorFilter scbParameterValidatorFilter() {
return new ParameterValidatorFilter();
}
}
diff --git
a/core/src/main/java/org/apache/servicecomb/core/invocation/CoreInvocationConfiguration.java
b/core/src/main/java/org/apache/servicecomb/core/invocation/CoreInvocationConfiguration.java
index 8fadf19d2..abfe2f053 100644
---
a/core/src/main/java/org/apache/servicecomb/core/invocation/CoreInvocationConfiguration.java
+++
b/core/src/main/java/org/apache/servicecomb/core/invocation/CoreInvocationConfiguration.java
@@ -29,19 +29,19 @@ import com.google.common.eventbus.EventBus;
@Configuration
public class CoreInvocationConfiguration {
@Bean
- public InvocationTimeoutBootListener invocationTimeoutBootListener(EventBus
eventBus,
+ public InvocationTimeoutBootListener
scbInvocationTimeoutBootListener(EventBus eventBus,
List<InvocationTimeoutStrategy> strategies,
Environment environment) {
return new InvocationTimeoutBootListener(eventBus, strategies,
environment);
}
@Bean
- public PassingTimeStrategy passingTimeStrategy() {
+ public PassingTimeStrategy scbPassingTimeStrategy() {
return new PassingTimeStrategy();
}
@Bean
- public ProcessingTimeStrategy processingTimeStrategy() {
+ public ProcessingTimeStrategy scbProcessingTimeStrategy() {
return new ProcessingTimeStrategy();
}
}
diff --git
a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeCoreConfiguration.java
b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeCoreConfiguration.java
index 5f6adc097..6fa0457c7 100644
---
a/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeCoreConfiguration.java
+++
b/edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeCoreConfiguration.java
@@ -23,12 +23,12 @@ import org.springframework.core.env.Environment;
@Configuration
public class EdgeCoreConfiguration {
@Bean
- public EdgeBootListener edgeBootListener() {
+ public EdgeBootListener scbEdgeBootListener() {
return new EdgeBootListener();
}
@Bean
- public EdgeAddHeaderFilter edgeAddHeaderFilter(Environment environment) {
+ public EdgeAddHeaderFilter scbEdgeAddHeaderFilter(Environment environment) {
return new EdgeAddHeaderFilter(environment);
}
}
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/auth/FoundationCommonAuthConfiguration.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/auth/FoundationCommonAuthConfiguration.java
index 19ea1e752..7faea74a3 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/auth/FoundationCommonAuthConfiguration.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/auth/FoundationCommonAuthConfiguration.java
@@ -20,7 +20,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class FoundationCommonAuthConfiguration {
- public ShaAKSKCipher shaAKSKCipher() {
+ public ShaAKSKCipher scbShaAKSKCipher() {
return new ShaAKSKCipher();
}
}
diff --git
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/EventManager.java
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/EventManager.java
index aad5e69fb..50b474050 100644
---
a/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/EventManager.java
+++
b/foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/EventManager.java
@@ -56,7 +56,7 @@ public class EventManager {
}
@Bean
- public EventBus eventBus() {
+ public EventBus scbEventBus() {
return eventBus;
}
}
diff --git
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/FoundationConfigConfiguration.java
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/FoundationConfigConfiguration.java
index c6dd81a97..1f74e897d 100644
---
a/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/FoundationConfigConfiguration.java
+++
b/foundations/foundation-config/src/main/java/org/apache/servicecomb/config/FoundationConfigConfiguration.java
@@ -31,39 +31,39 @@ import org.springframework.core.env.Environment;
@SuppressWarnings("unused")
public class FoundationConfigConfiguration {
@Bean
- public static InjectBeanPostProcessor injectBeanPostProcessor(
+ public static InjectBeanPostProcessor scbInjectBeanPostProcessor(
@Autowired @Lazy PriorityPropertyManager priorityPropertyManager) {
return new InjectBeanPostProcessor(priorityPropertyManager);
}
@Bean
- public PriorityPropertyManager priorityPropertyManager(ConfigObjectFactory
configObjectFactory) {
+ public PriorityPropertyManager
scbPriorityPropertyManager(ConfigObjectFactory configObjectFactory) {
return new PriorityPropertyManager(configObjectFactory);
}
@Bean
- public PriorityPropertyFactory priorityPropertyFactory(Environment
environment) {
+ public PriorityPropertyFactory scbPriorityPropertyFactory(Environment
environment) {
return new PriorityPropertyFactory(environment);
}
@Bean
- public DynamicPropertiesImpl dynamicProperties(Environment environment) {
+ public DynamicPropertiesImpl scbDynamicProperties(Environment environment) {
return new DynamicPropertiesImpl(environment);
}
@Bean
- public ConfigObjectFactory configObjectFactory(PriorityPropertyFactory
propertyFactory) {
+ public ConfigObjectFactory scbConfigObjectFactory(PriorityPropertyFactory
propertyFactory) {
return new ConfigObjectFactory(propertyFactory);
}
@Bean
@ConfigurationProperties(prefix = DataCenterProperties.PREFIX)
- public DataCenterProperties dataCenterProperties() {
+ public DataCenterProperties scbDataCenterProperties() {
return new DataCenterProperties();
}
@Bean
- public InMemoryDynamicPropertiesSource inMemoryDynamicPropertiesSource() {
+ public InMemoryDynamicPropertiesSource scbInMemoryDynamicPropertiesSource() {
return new InMemoryDynamicPropertiesSource();
}
}
diff --git
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistryConfiguration.java
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistryConfiguration.java
index 6581d266b..7a1d72460 100644
---
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistryConfiguration.java
+++
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/RegistryConfiguration.java
@@ -35,40 +35,40 @@ import org.springframework.context.annotation.Configuration;
@SuppressWarnings("unused")
public class RegistryConfiguration {
@Bean
- public RegistrationManager registrationManager(
+ public RegistrationManager scbRegistrationManager(
List<Registration<? extends RegistrationInstance>> registrationList) {
return new RegistrationManager(registrationList);
}
@Bean
- public TelnetInstancePing telnetInstancePing() {
+ public TelnetInstancePing scbTelnetInstancePing() {
return new TelnetInstancePing();
}
@Bean
- public DiscoveryManager discoveryManager(
+ public DiscoveryManager scbDiscoveryManager(
List<Discovery<? extends DiscoveryInstance>> discoveryList,
List<InstancePing> pingList) {
return new DiscoveryManager(discoveryList, pingList);
}
@Bean
- public DiscoveryTree discoveryTree(DiscoveryManager discoveryManager) {
+ public DiscoveryTree scbDiscoveryTree(DiscoveryManager discoveryManager) {
return new DiscoveryTree(discoveryManager);
}
@Bean
- public InstanceStatusDiscoveryFilter instanceStatusDiscoveryFilter() {
+ public InstanceStatusDiscoveryFilter scbInstanceStatusDiscoveryFilter() {
return new InstanceStatusDiscoveryFilter();
}
@Bean
- public MicroserviceInstanceCache microserviceInstanceCache(DiscoveryManager
discoveryManager) {
+ public MicroserviceInstanceCache
scbMicroserviceInstanceCache(DiscoveryManager discoveryManager) {
return new MicroserviceInstanceCache(discoveryManager);
}
@Bean
- public RegistrationId registrationId() {
+ public RegistrationId scbRegistrationId() {
return new RegistrationId();
}
}
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/GovernanceCommonConfiguration.java
b/governance/src/main/java/org/apache/servicecomb/governance/GovernanceCommonConfiguration.java
index bd3929ad6..b5fd042a7 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/GovernanceCommonConfiguration.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/GovernanceCommonConfiguration.java
@@ -42,10 +42,9 @@ import
org.apache.servicecomb.governance.marker.operator.MatchOperator;
import org.apache.servicecomb.governance.marker.operator.PrefixOperator;
import org.apache.servicecomb.governance.marker.operator.SuffixOperator;
import org.apache.servicecomb.governance.properties.BulkheadProperties;
-import org.apache.servicecomb.governance.properties.TimeLimiterProperties;
-import org.apache.servicecomb.governance.properties.GovernanceCacheProperties;
import org.apache.servicecomb.governance.properties.CircuitBreakerProperties;
import org.apache.servicecomb.governance.properties.FaultInjectionProperties;
+import org.apache.servicecomb.governance.properties.GovernanceCacheProperties;
import
org.apache.servicecomb.governance.properties.IdentifierRateLimitProperties;
import org.apache.servicecomb.governance.properties.InstanceBulkheadProperties;
import
org.apache.servicecomb.governance.properties.InstanceIsolationProperties;
@@ -54,6 +53,7 @@ import
org.apache.servicecomb.governance.properties.MapperProperties;
import org.apache.servicecomb.governance.properties.MatchProperties;
import org.apache.servicecomb.governance.properties.RateLimitProperties;
import org.apache.servicecomb.governance.properties.RetryProperties;
+import org.apache.servicecomb.governance.properties.TimeLimiterProperties;
import org.apache.servicecomb.governance.service.MatchersService;
import org.apache.servicecomb.governance.service.MatchersServiceImpl;
import org.springframework.beans.factory.ObjectProvider;
@@ -66,175 +66,175 @@ import io.micrometer.core.instrument.MeterRegistry;
public class GovernanceCommonConfiguration {
// properties configuration
@Bean
- public BulkheadProperties bulkheadProperties() {
+ public BulkheadProperties scbBulkheadProperties() {
return new BulkheadProperties();
}
@Bean
- public InstanceBulkheadProperties instanceBulkheadProperties() {
+ public InstanceBulkheadProperties scbInstanceBulkheadProperties() {
return new InstanceBulkheadProperties();
}
@Bean
- public CircuitBreakerProperties circuitBreakerProperties() {
+ public CircuitBreakerProperties scbCircuitBreakerProperties() {
return new CircuitBreakerProperties();
}
@Bean
- public InstanceIsolationProperties instanceIsolationProperties() {
+ public InstanceIsolationProperties scbInstanceIsolationProperties() {
return new InstanceIsolationProperties();
}
@Bean
- public MatchProperties matchProperties() {
+ public MatchProperties scbMatchProperties() {
return new MatchProperties();
}
@Bean
- public RateLimitProperties rateLimitProperties() {
+ public RateLimitProperties scbRateLimitProperties() {
return new RateLimitProperties();
}
@Bean
- public IdentifierRateLimitProperties identifierRateLimitProperties() {
+ public IdentifierRateLimitProperties scbIdentifierRateLimitProperties() {
return new IdentifierRateLimitProperties();
}
@Bean
- public RetryProperties retryProperties() {
+ public RetryProperties scbRetryProperties() {
return new RetryProperties();
}
@Bean
- public TimeLimiterProperties timeLimiterProperties() {
+ public TimeLimiterProperties scbTimeLimiterProperties() {
return new TimeLimiterProperties();
}
@Bean
- public GovernanceCacheProperties cacheProperties() {
+ public GovernanceCacheProperties scbCacheProperties() {
return new GovernanceCacheProperties();
}
@Bean
- public FaultInjectionProperties faultInjectionProperties() {
+ public FaultInjectionProperties scbFaultInjectionProperties() {
return new FaultInjectionProperties();
}
@Bean
- public LoadBalanceProperties loadBalanceProperties() {
+ public LoadBalanceProperties scbLoadBalanceProperties() {
return new LoadBalanceProperties();
}
@Bean
- public MapperProperties mapperProperties() {
+ public MapperProperties scbMapperProperties() {
return new MapperProperties();
}
// handlers configuration
@Bean
- public BulkheadHandler bulkheadHandler(BulkheadProperties
bulkheadProperties) {
- return new BulkheadHandler(bulkheadProperties);
+ public BulkheadHandler scbBulkheadHandler(BulkheadProperties
scbBulkheadProperties) {
+ return new BulkheadHandler(scbBulkheadProperties);
}
@Bean
- public InstanceBulkheadHandler
instanceBulkheadHandler(InstanceBulkheadProperties instanceBulkheadProperties) {
- return new InstanceBulkheadHandler(instanceBulkheadProperties);
+ public InstanceBulkheadHandler
scbInstanceBulkheadHandler(InstanceBulkheadProperties
scbInstanceBulkheadProperties) {
+ return new InstanceBulkheadHandler(scbInstanceBulkheadProperties);
}
@Bean
- public LoadBalanceHandler loadBalanceHandler(LoadBalanceProperties
loadBalanceProperties) {
+ public LoadBalanceHandler scbLoadBalanceHandler(LoadBalanceProperties
loadBalanceProperties) {
return new LoadBalanceHandler(loadBalanceProperties);
}
@Bean
- public CircuitBreakerHandler circuitBreakerHandler(CircuitBreakerProperties
circuitBreakerProperties,
+ public CircuitBreakerHandler
scbCircuitBreakerHandler(CircuitBreakerProperties scbCircuitBreakerProperties,
AbstractCircuitBreakerExtension circuitBreakerExtension) {
- return new CircuitBreakerHandler(circuitBreakerProperties,
circuitBreakerExtension);
+ return new CircuitBreakerHandler(scbCircuitBreakerProperties,
circuitBreakerExtension);
}
@Bean
- public InstanceIsolationHandler
instanceIsolationHandler(InstanceIsolationProperties
instanceIsolationProperties,
+ public InstanceIsolationHandler
scbInstanceIsolationHandler(InstanceIsolationProperties
scbInstanceIsolationProperties,
AbstractInstanceIsolationExtension isolationExtension,
ObjectProvider<MeterRegistry> meterRegistry) {
- return new InstanceIsolationHandler(instanceIsolationProperties,
isolationExtension, meterRegistry);
+ return new InstanceIsolationHandler(scbInstanceIsolationProperties,
isolationExtension, meterRegistry);
}
@Bean
- public RateLimitingHandler rateLimitingHandler(RateLimitProperties
rateLimitProperties) {
+ public RateLimitingHandler scbRateLimitingHandler(RateLimitProperties
rateLimitProperties) {
return new RateLimitingHandler(rateLimitProperties);
}
@Bean
- public IdentifierRateLimitingHandler identifierRateLimitingHandler(
+ public IdentifierRateLimitingHandler scbIdentifierRateLimitingHandler(
IdentifierRateLimitProperties identifierRateLimitProperties) {
return new IdentifierRateLimitingHandler(identifierRateLimitProperties);
}
@Bean
- public RetryHandler retryHandler(RetryProperties retryProperties,
AbstractRetryExtension retryExtension) {
+ public RetryHandler scbRetryHandler(RetryProperties retryProperties,
AbstractRetryExtension retryExtension) {
return new RetryHandler(retryProperties, retryExtension);
}
@Bean
- public TimeLimiterHandler timeLimiterHandler(TimeLimiterProperties
timeLimiterProperties) {
+ public TimeLimiterHandler scbTimeLimiterHandler(TimeLimiterProperties
timeLimiterProperties) {
return new TimeLimiterHandler(timeLimiterProperties);
}
@Bean
- public GovernanceCacheHandler<String, Object>
governanceCacheHandler(GovernanceCacheProperties cacheProperties) {
+ public GovernanceCacheHandler<String, Object>
scbGovernanceCacheHandler(GovernanceCacheProperties cacheProperties) {
return new GovernanceCacheHandler<String, Object>(cacheProperties);
}
@Bean
- public FaultInjectionHandler faultInjectionHandler(FaultInjectionProperties
faultInjectionProperties) {
- return new FaultInjectionHandler(faultInjectionProperties);
+ public FaultInjectionHandler
scbFaultInjectionHandler(FaultInjectionProperties scbFaultInjectionProperties) {
+ return new FaultInjectionHandler(scbFaultInjectionProperties);
}
@Bean
- public MapperHandler mapperHandler(MapperProperties mapperProperties) {
- return new MapperHandler(mapperProperties);
+ public MapperHandler scbMapperHandler(MapperProperties scbMapperProperties) {
+ return new MapperHandler(scbMapperProperties);
}
// request processor
@Bean
- public RequestProcessor requestProcessor(Map<String, MatchOperator>
operatorMap) {
+ public RequestProcessor scbRequestProcessor(Map<String, MatchOperator>
operatorMap) {
return new RequestProcessor(operatorMap);
}
// matchers
@Bean
- public MatchersService matchersService(RequestProcessor requestProcessor,
MatchProperties matchProperties) {
- return new MatchersServiceImpl(requestProcessor, matchProperties);
+ public MatchersService scbMatchersService(RequestProcessor requestProcessor,
MatchProperties scbMatchProperties) {
+ return new MatchersServiceImpl(requestProcessor, scbMatchProperties);
}
@Bean
- public MatchersManager matchersManager(MatchersService matchersService) {
+ public MatchersManager scbMatchersManager(MatchersService matchersService) {
return new MatchersManager(matchersService);
}
// operators
@Bean
- public CompareOperator compareOperator() {
+ public CompareOperator scbCompareOperator() {
return new CompareOperator();
}
@Bean
- public ContainsOperator containsOperator() {
+ public ContainsOperator scbContainsOperator() {
return new ContainsOperator();
}
@Bean
- public ExactOperator exactOperator() {
+ public ExactOperator scbExactOperator() {
return new ExactOperator();
}
@Bean
- public PrefixOperator prefixOperator() {
+ public PrefixOperator scbPrefixOperator() {
return new PrefixOperator();
}
@Bean
- public SuffixOperator suffixOperator() {
+ public SuffixOperator scbSuffixOperator() {
return new SuffixOperator();
}
}
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/marker/RequestProcessor.java
b/governance/src/main/java/org/apache/servicecomb/governance/marker/RequestProcessor.java
index f8e077ed1..9651d8a77 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/marker/RequestProcessor.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/marker/RequestProcessor.java
@@ -16,6 +16,7 @@
*/
package org.apache.servicecomb.governance.marker;
+import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
@@ -44,14 +45,13 @@ public class RequestProcessor implements
ApplicationContextAware {
public static final String infoMessageForCreatingClass = "is not in spring
container, create one and register it to spring container";
- private static final String OPERATOR_SUFFIX = "Operator";
-
private final Map<String, MatchOperator> operatorMap;
private ApplicationContext applicationContext;
public RequestProcessor(Map<String, MatchOperator> operatorMap) {
- this.operatorMap = operatorMap;
+ this.operatorMap = new HashMap<>(operatorMap.size());
+ operatorMap.forEach((k, v) -> this.operatorMap.put(v.name(), v));
}
public boolean match(GovernanceRequestExtractor request, Matcher matcher) {
@@ -126,7 +126,7 @@ public class RequestProcessor implements
ApplicationContextAware {
}
for (Entry<String, String> entry : rawOperator.entrySet()) {
- MatchOperator operator = operatorMap.get(entry.getKey() +
OPERATOR_SUFFIX);
+ MatchOperator operator = operatorMap.get(entry.getKey());
if (operator == null) {
LOGGER.error("unsupported operator:" + entry.getKey() + ", please use
one of :" + operatorMap.keySet());
return false;
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/CompareOperator.java
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/CompareOperator.java
index ff491ecef..5379bf8c2 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/CompareOperator.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/CompareOperator.java
@@ -32,6 +32,11 @@ public class CompareOperator implements MatchOperator {
charSet.add('!');
}
+ @Override
+ public String name() {
+ return "compare";
+ }
+
/**
* 支持 > < = >= <= ! 后面加数字
*
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ContainsOperator.java
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ContainsOperator.java
index a5bb935f9..faa405214 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ContainsOperator.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ContainsOperator.java
@@ -18,6 +18,11 @@ package org.apache.servicecomb.governance.marker.operator;
public class ContainsOperator implements MatchOperator {
+ @Override
+ public String name() {
+ return "contains";
+ }
+
@Override
public boolean match(String targetStr, String patternStr) {
return targetStr.contains(patternStr);
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ExactOperator.java
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ExactOperator.java
index 139d2f8cd..cee8d48a2 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ExactOperator.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/ExactOperator.java
@@ -20,6 +20,11 @@ import org.apache.commons.lang3.StringUtils;
public class ExactOperator implements MatchOperator {
+ @Override
+ public String name() {
+ return "exact";
+ }
+
@Override
public boolean match(String targetStr, String patternStr) {
return StringUtils.equals(targetStr, patternStr);
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java
index db9290745..28abc1b8d 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/MatchOperator.java
@@ -17,6 +17,7 @@
package org.apache.servicecomb.governance.marker.operator;
public interface MatchOperator {
+ String name();
boolean match(String targetStr, String patternStr);
}
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/PrefixOperator.java
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/PrefixOperator.java
index e211d0d60..6bb84c45a 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/PrefixOperator.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/PrefixOperator.java
@@ -20,6 +20,11 @@ package org.apache.servicecomb.governance.marker.operator;
import org.apache.commons.lang3.StringUtils;
public class PrefixOperator implements MatchOperator {
+ @Override
+ public String name() {
+ return "prefix";
+ }
+
@Override
public boolean match(String requestValue, String patternValue) {
return StringUtils.startsWith(requestValue, patternValue);
diff --git
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/SuffixOperator.java
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/SuffixOperator.java
index 712b00b6b..99adf9fed 100644
---
a/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/SuffixOperator.java
+++
b/governance/src/main/java/org/apache/servicecomb/governance/marker/operator/SuffixOperator.java
@@ -20,6 +20,11 @@ package org.apache.servicecomb.governance.marker.operator;
import org.apache.commons.lang3.StringUtils;
public class SuffixOperator implements MatchOperator {
+ @Override
+ public String name() {
+ return "suffix";
+ }
+
@Override
public boolean match(String requestValue, String patternValue) {
return StringUtils.endsWith(requestValue, patternValue);
diff --git
a/governance/src/main/java/org/apache/servicecomb/router/RouterCommonConfiguration.java
b/governance/src/main/java/org/apache/servicecomb/router/RouterCommonConfiguration.java
index 0e12cc753..9aa881ee8 100644
---
a/governance/src/main/java/org/apache/servicecomb/router/RouterCommonConfiguration.java
+++
b/governance/src/main/java/org/apache/servicecomb/router/RouterCommonConfiguration.java
@@ -26,17 +26,17 @@ import org.springframework.core.env.Environment;
@Configuration
public class RouterCommonConfiguration {
@Bean
- public RouterRuleCache routerRuleCache(Environment environment) {
+ public RouterRuleCache scbRouterRuleCache(Environment environment) {
return new RouterRuleCache(environment);
}
@Bean
- public RouterRuleMatcher routerRuleMatcher(RouterRuleCache routerRuleCache,
RequestProcessor requestProcessor) {
+ public RouterRuleMatcher scbRouterRuleMatcher(RouterRuleCache
routerRuleCache, RequestProcessor requestProcessor) {
return new RouterRuleMatcher(routerRuleCache, requestProcessor);
}
@Bean
- public RouterFilter routerFilter(RouterRuleMatcher routerRuleMatcher,
RouterRuleCache routerRuleCache) {
+ public RouterFilter scbRouterFilter(RouterRuleMatcher routerRuleMatcher,
RouterRuleCache routerRuleCache) {
return new RouterFilter(routerRuleMatcher, routerRuleCache);
}
}
diff --git
a/governance/src/test/java/org/apache/servicecomb/governance/BulkheadHandlerTest.java
b/governance/src/test/java/org/apache/servicecomb/governance/BulkheadHandlerTest.java
index 4e77fa900..59703d4ee 100644
---
a/governance/src/test/java/org/apache/servicecomb/governance/BulkheadHandlerTest.java
+++
b/governance/src/test/java/org/apache/servicecomb/governance/BulkheadHandlerTest.java
@@ -32,8 +32,8 @@ public class BulkheadHandlerTest {
private BulkheadHandler bulkheadHandler;
@Autowired
- public void setInstanceIsolationHandler(BulkheadHandler bulkheadHandler) {
- this.bulkheadHandler = bulkheadHandler;
+ public void setInstanceIsolationHandler(BulkheadHandler scbBulkheadHandler) {
+ this.bulkheadHandler = scbBulkheadHandler;
}
@Test
diff --git
a/governance/src/test/java/org/apache/servicecomb/governance/FaultInjectionTest.java
b/governance/src/test/java/org/apache/servicecomb/governance/FaultInjectionTest.java
index 919f260d0..7733b8ed4 100644
---
a/governance/src/test/java/org/apache/servicecomb/governance/FaultInjectionTest.java
+++
b/governance/src/test/java/org/apache/servicecomb/governance/FaultInjectionTest.java
@@ -42,9 +42,9 @@ public class FaultInjectionTest {
private FaultInjectionHandler faultInjectionHandler2;
@Autowired
- public void setFaultInjectionHandler(FaultInjectionHandler
faultInjectionHandler,
+ public void setFaultInjectionHandler(FaultInjectionHandler
scbFaultInjectionHandler,
@Qualifier("faultInjectionHandler2") FaultInjectionHandler
faultInjectionHandler2) {
- this.faultInjectionHandler = faultInjectionHandler;
+ this.faultInjectionHandler = scbFaultInjectionHandler;
this.faultInjectionHandler2 = faultInjectionHandler2;
}
diff --git
a/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java
b/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java
index 4f12dec62..5b71a2ac3 100644
---
a/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java
+++
b/governance/src/test/java/org/apache/servicecomb/governance/GovernancePropertiesTest.java
@@ -89,49 +89,49 @@ public class GovernancePropertiesTest {
}
@Autowired
- public void setMatchProperties(MatchProperties matchProperties) {
- this.matchProperties = matchProperties;
+ public void setMatchProperties(MatchProperties scbMatchProperties) {
+ this.matchProperties = scbMatchProperties;
}
@Autowired
- public void setBulkheadProperties(BulkheadProperties bulkheadProperties) {
- this.bulkheadProperties = bulkheadProperties;
+ public void setBulkheadProperties(BulkheadProperties scbBulkheadProperties) {
+ this.bulkheadProperties = scbBulkheadProperties;
}
@Autowired
- public void setCircuitBreakerProperties(CircuitBreakerProperties
circuitBreakerProperties) {
- this.circuitBreakerProperties = circuitBreakerProperties;
+ public void setCircuitBreakerProperties(CircuitBreakerProperties
scbCircuitBreakerProperties) {
+ this.circuitBreakerProperties = scbCircuitBreakerProperties;
}
@Autowired
- public void setTimeLimiterProperties(TimeLimiterProperties
timeLimiterProperties) {
- this.timeLimiterProperties = timeLimiterProperties;
+ public void setTimeLimiterProperties(TimeLimiterProperties
scbTimeLimiterProperties) {
+ this.timeLimiterProperties = scbTimeLimiterProperties;
}
@Autowired
- public void setGovernanceCacheProperties(GovernanceCacheProperties
governanceCacheProperties) {
- this.governanceCacheProperties = governanceCacheProperties;
+ public void setGovernanceCacheProperties(GovernanceCacheProperties
scbGovernanceCacheProperties) {
+ this.governanceCacheProperties = scbGovernanceCacheProperties;
}
@Autowired
- public void setRateLimitProperties(RateLimitProperties rateLimitProperties) {
- this.rateLimitProperties = rateLimitProperties;
+ public void setRateLimitProperties(RateLimitProperties
scbRateLimitProperties) {
+ this.rateLimitProperties = scbRateLimitProperties;
}
@Autowired
- public void setInstanceIsolationProperties(InstanceIsolationProperties
instanceIsolationProperties) {
- this.instanceIsolationProperties = instanceIsolationProperties;
+ public void setInstanceIsolationProperties(InstanceIsolationProperties
scbInstanceIsolationProperties) {
+ this.instanceIsolationProperties = scbInstanceIsolationProperties;
}
@Autowired
- public void setRetryProperties(RetryProperties retryProperties) {
- this.retryProperties = retryProperties;
+ public void setRetryProperties(RetryProperties scbRetryProperties) {
+ this.retryProperties = scbRetryProperties;
}
@Autowired
public void setFaultInjectionProperties(
- FaultInjectionProperties faultInjectionProperties) {
- this.faultInjectionProperties = faultInjectionProperties;
+ FaultInjectionProperties scbFaultInjectionProperties) {
+ this.faultInjectionProperties = scbFaultInjectionProperties;
}
@Autowired
diff --git
a/governance/src/test/java/org/apache/servicecomb/governance/MapperTest.java
b/governance/src/test/java/org/apache/servicecomb/governance/MapperTest.java
index a8dcaac7e..4a4607fef 100644
--- a/governance/src/test/java/org/apache/servicecomb/governance/MapperTest.java
+++ b/governance/src/test/java/org/apache/servicecomb/governance/MapperTest.java
@@ -38,8 +38,8 @@ public class MapperTest {
private MapperHandler mapperHandler2;
@Autowired
- public void setMapperHandler(MapperHandler mapperHandler,
@Qualifier("mapperHandler2") MapperHandler mapperHandler2) {
- this.mapperHandler = mapperHandler;
+ public void setMapperHandler(MapperHandler scbMapperHandler,
@Qualifier("mapperHandler2") MapperHandler mapperHandler2) {
+ this.mapperHandler = scbMapperHandler;
this.mapperHandler2 = mapperHandler2;
}
diff --git
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionConfiguration.java
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionConfiguration.java
index d954ab336..600ed5dc9 100644
---
a/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionConfiguration.java
+++
b/handlers/handler-fault-injection/src/main/java/org/apache/servicecomb/faultinjection/FaultInjectionConfiguration.java
@@ -29,12 +29,12 @@ public class FaultInjectionConfiguration {
public static final String FAULT_INJECTION_ENABLED = FAULT_INJECTION_PREFIX
+ ".enabled";
@Bean
- public ConsumerAbortFaultFilter consumerAbortFaultFilter() {
+ public ConsumerAbortFaultFilter scbConsumerAbortFaultFilter() {
return new ConsumerAbortFaultFilter();
}
@Bean
- public ConsumerDelayFaultFilter consumerDelayFaultFilter() {
+ public ConsumerDelayFaultFilter scbConsumerDelayFaultFilter() {
return new ConsumerDelayFaultFilter();
}
}
diff --git
a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/FlowControlQpsConfiguration.java
b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/FlowControlQpsConfiguration.java
index ab2b974e5..d5fd7702c 100644
---
a/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/FlowControlQpsConfiguration.java
+++
b/handlers/handler-flowcontrol-qps/src/main/java/org/apache/servicecomb/qps/FlowControlQpsConfiguration.java
@@ -30,12 +30,12 @@ public class FlowControlQpsConfiguration {
public static final String FLOW_CONTROL_ENABLED = FLOW_CONTROL_PREFIX +
".enabled";
@Bean
- public ProviderFlowControlFilter providerFlowControlFilter(Environment
environment) {
+ public ProviderFlowControlFilter scbProviderFlowControlFilter(Environment
environment) {
return new ProviderFlowControlFilter(environment);
}
@Bean
- public ConsumerFlowControlFilter consumerFlowControlFilter(Environment
environment) {
+ public ConsumerFlowControlFilter scbConsumerFlowControlFilter(Environment
environment) {
return new ConsumerFlowControlFilter(environment);
}
}
diff --git
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/HandlerGovernanceConfiguration.java
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/HandlerGovernanceConfiguration.java
index b4d8f4872..9223146a7 100644
---
a/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/HandlerGovernanceConfiguration.java
+++
b/handlers/handler-governance/src/main/java/org/apache/servicecomb/handler/governance/HandlerGovernanceConfiguration.java
@@ -34,29 +34,29 @@ public class HandlerGovernanceConfiguration {
public static final String GOVERNANCE_ENABLED = GOVERNANCE_PREFIX +
".enabled";
@Bean
- public ConsumerInstanceBulkheadFilter consumerInstanceBulkheadFilter(
+ public ConsumerInstanceBulkheadFilter scbConsumerInstanceBulkheadFilter(
InstanceBulkheadHandler instanceBulkheadHandler) {
return new ConsumerInstanceBulkheadFilter(instanceBulkheadHandler);
}
@Bean
- public ConsumerInstanceIsolationFilter consumerInstanceIsolationFilter(
+ public ConsumerInstanceIsolationFilter scbConsumerInstanceIsolationFilter(
InstanceIsolationHandler instanceIsolationHandler) {
return new ConsumerInstanceIsolationFilter(instanceIsolationHandler);
}
@Bean
- public ProviderBulkheadFilter providerBulkheadFilter(BulkheadHandler
bulkheadHandler) {
+ public ProviderBulkheadFilter scbProviderBulkheadFilter(BulkheadHandler
bulkheadHandler) {
return new ProviderBulkheadFilter(bulkheadHandler);
}
@Bean
- public ProviderCircuitBreakerFilter
providerCircuitBreakerFilter(CircuitBreakerHandler circuitBreakerHandler) {
+ public ProviderCircuitBreakerFilter
scbProviderCircuitBreakerFilter(CircuitBreakerHandler circuitBreakerHandler) {
return new ProviderCircuitBreakerFilter(circuitBreakerHandler);
}
@Bean
- public ProviderRateLimitingFilter
providerRateLimitingFilter(RateLimitingHandler rateLimitingHandler) {
+ public ProviderRateLimitingFilter
scbProviderRateLimitingFilter(RateLimitingHandler rateLimitingHandler) {
return new ProviderRateLimitingFilter(rateLimitingHandler);
}
}
diff --git
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
index f7042ef74..b8e5ecaa6 100644
---
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
+++
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalanceConfiguration.java
@@ -37,38 +37,38 @@ public class LoadBalanceConfiguration {
public static final String LOAD_BALANCE_ENABLED = LOAD_BALANCE_PREFIX +
".enabled";
@Bean
- public LoadBalanceFilter loadBalanceFilter(ExtensionsManager
extensionsManager, DiscoveryTree discoveryTree,
+ public LoadBalanceFilter scbLoadBalanceFilter(ExtensionsManager
extensionsManager, DiscoveryTree discoveryTree,
SCBEngine scbEngine) {
return new LoadBalanceFilter(extensionsManager, discoveryTree, scbEngine);
}
@Bean
- public RuleNameExtentionsFactory ruleNameExtentionsFactory() {
+ public RuleNameExtentionsFactory scbRuleNameExtentionsFactory() {
return new RuleNameExtentionsFactory();
}
@Bean
- public ExtensionsManager extensionsManager(List<ExtensionsFactory>
extensionsFactories) {
+ public ExtensionsManager scbExtensionsManager(List<ExtensionsFactory>
extensionsFactories) {
return new ExtensionsManager(extensionsFactories);
}
@Bean
- public PriorityInstancePropertyDiscoveryFilter
priorityInstancePropertyDiscoveryFilter() {
+ public PriorityInstancePropertyDiscoveryFilter
scbPriorityInstancePropertyDiscoveryFilter() {
return new PriorityInstancePropertyDiscoveryFilter();
}
@Bean
- public InstancePropertyDiscoveryFilter instancePropertyDiscoveryFilter() {
+ public InstancePropertyDiscoveryFilter scbInstancePropertyDiscoveryFilter() {
return new InstancePropertyDiscoveryFilter();
}
@Bean
- public ServerDiscoveryFilter serverDiscoveryFilter() {
+ public ServerDiscoveryFilter scbServerDiscoveryFilter() {
return new ServerDiscoveryFilter();
}
@Bean
- public ZoneAwareDiscoveryFilter zoneAwareDiscoveryFilter() {
+ public ZoneAwareDiscoveryFilter scbZoneAwareDiscoveryFilter() {
return new ZoneAwareDiscoveryFilter();
}
}
diff --git
a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/AuthenticationConfiguration.java
b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/AuthenticationConfiguration.java
index 172a640a8..a7f8ea308 100644
---
a/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/AuthenticationConfiguration.java
+++
b/handlers/handler-publickey-auth/src/main/java/org/apache/servicecomb/authentication/AuthenticationConfiguration.java
@@ -35,32 +35,32 @@ public class AuthenticationConfiguration {
public static final String ACCESS_CONTROL_ENABLED = ACCESS_CONTROL_PREFIX +
".enabled";
@Bean
- public ConsumerAuthFilter consumerAuthFilter() {
+ public ConsumerAuthFilter scbConsumerAuthFilter() {
return new ConsumerAuthFilter();
}
@Bean
- public ProviderAuthFilter providerAuthFilter() {
+ public ProviderAuthFilter scbProviderAuthFilter() {
return new ProviderAuthFilter();
}
@Bean
- public AuthenticationBootListener authenticationBootListener() {
+ public AuthenticationBootListener scbAuthenticationBootListener() {
return new AuthenticationBootListener();
}
@Bean
- public ConsumerTokenManager consumerTokenManager() {
+ public ConsumerTokenManager scbConsumerTokenManager() {
return new ConsumerTokenManager();
}
@Bean
- public ProviderTokenManager providerTokenManager() {
+ public ProviderTokenManager scbProviderTokenManager() {
return new ProviderTokenManager();
}
@Bean
- public AccessController accessController(Environment environment) {
+ public AccessController scbAccessController(Environment environment) {
return new AccessController(environment);
}
}
diff --git
a/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/ServiceCombRouterConfiguration.java
b/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/ServiceCombRouterConfiguration.java
index 5e98b714b..ff6952d24 100644
---
a/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/ServiceCombRouterConfiguration.java
+++
b/handlers/handler-router/src/main/java/org/apache/servicecomb/router/custom/ServiceCombRouterConfiguration.java
@@ -29,7 +29,7 @@ public class ServiceCombRouterConfiguration {
public static final String ROUTER_ENABLED = ROUTER_PREFIX + ".enabled";
@Bean
- public ServiceCombRouterDistributor serviceCombRouterDistributor() {
+ public ServiceCombRouterDistributor scbServiceCombRouterDistributor() {
return new ServiceCombRouterDistributor();
}
}
diff --git
a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java
b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java
index 428599e69..79dbc2857 100644
---
a/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java
+++
b/handlers/handler-tracing-zipkin/src/main/java/org/apache/servicecomb/tracing/zipkin/TracingConfiguration.java
@@ -71,7 +71,7 @@ public class TracingConfiguration {
havingValue = "true")
static class ZipkinReporterConfiguration {
@Bean
- BytesMessageSender okHttpSender(DynamicProperties dynamicProperties) {
+ BytesMessageSender scbOkHttpSender(DynamicProperties dynamicProperties) {
String apiVersion =
dynamicProperties.getStringProperty(CONFIG_TRACING_COLLECTOR_API_VERSION,
CONFIG_TRACING_COLLECTOR_API_V2).toLowerCase();
// use default value if the user set value is invalid
@@ -90,7 +90,7 @@ public class TracingConfiguration {
}
@Bean
- Reporter<Span> zipkinReporter(DynamicProperties dynamicProperties,
BytesMessageSender sender) {
+ Reporter<Span> scbZipkinReporter(DynamicProperties dynamicProperties,
BytesMessageSender sender) {
String apiVersion =
dynamicProperties.getStringProperty(CONFIG_TRACING_COLLECTOR_API_VERSION,
CONFIG_TRACING_COLLECTOR_API_V2).toLowerCase();
if (apiVersion.compareTo(CONFIG_TRACING_COLLECTOR_API_V1) == 0) {
@@ -102,14 +102,14 @@ public class TracingConfiguration {
}
@Bean
- CurrentTraceContext currentTraceContext() {
+ CurrentTraceContext scbCurrentTraceContext() {
return ThreadLocalCurrentTraceContext.newBuilder()
.addScopeDecorator(MDCScopeDecorator.newBuilder().build())
.build();
}
@Bean
- Tracing tracing(@Autowired(required = false) Sender sender,
+ Tracing scbTracing(@Autowired(required = false) Sender sender,
CurrentTraceContext currentTraceContext, Environment environment,
DynamicProperties dynamicProperties) {
Tracing.Builder builder = Tracing.newBuilder()
.localServiceName(BootStrapProperties.readServiceName(environment))
@@ -124,7 +124,7 @@ public class TracingConfiguration {
}
@Bean
- HttpTracing httpTracing(Tracing tracing) {
+ HttpTracing scbHttpTracing(Tracing tracing) {
return HttpTracing.newBuilder(tracing)
.clientRequestParser(new CustomHttpRequestParser())
.clientResponseParser(new CustomHttpResponseParser())
@@ -133,7 +133,7 @@ public class TracingConfiguration {
}
@Bean
- ZipkinTracingFilter zipkinTracingFilter() {
+ ZipkinTracingFilter scbZipkinTracingFilter() {
return new ZipkinTracingFilter();
}
diff --git
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DashboardConfiguration.java
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DashboardConfiguration.java
index 885b8bbf2..328b6bf6e 100644
---
a/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DashboardConfiguration.java
+++
b/huawei-cloud/dashboard/src/main/java/org/apache/servicecomb/huaweicloud/dashboard/monitor/DashboardConfiguration.java
@@ -24,32 +24,32 @@ import org.springframework.core.env.Environment;
@Configuration
public class DashboardConfiguration {
@Bean
- public MonitorInformationCollector monitorInformationCollector() {
+ public MonitorInformationCollector scbMonitorInformationCollector() {
return new MonitorInformationCollector();
}
@Bean
- public MonitorConstant monitorConstant(Environment environment) {
+ public MonitorConstant scbMonitorConstant(Environment environment) {
return new MonitorConstant(environment);
}
@Bean
- public MonitorBootListener monitorBootListener() {
+ public MonitorBootListener scbMonitorBootListener() {
return new MonitorBootListener();
}
@Bean
- public DataFactory dataFactory() {
+ public DataFactory scbDataFactory() {
return new DataFactory();
}
@Bean
- public MetricsMonitorDataProvider metricsMonitorDataProvider() {
+ public MetricsMonitorDataProvider scbMetricsMonitorDataProvider() {
return new MetricsMonitorDataProvider();
}
@Bean
- public DefaultMonitorDataPublisher defaultMonitorDataPublisher() {
+ public DefaultMonitorDataPublisher scbDefaultMonitorDataPublisher() {
return new DefaultMonitorDataPublisher();
}
}
diff --git
a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java
b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java
index 99b1acd20..73327df13 100644
---
a/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java
+++
b/metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/publish/DefaultLogPublisher.java
@@ -314,7 +314,7 @@ public class DefaultLogPublisher implements
MetricsInitializer {
for (int i = 0; i < perfGroup.getOperationPerfs().size(); i++) {
OperationPerf operationPerf = perfGroup.getOperationPerfs().get(i);
- if (isIngoreEmptyPerf(operationPerf)) {
+ if (isIgnoreEmptyPerf(operationPerf)) {
continue;
}
PerfInfo stageTotal =
operationPerf.findStage(InvocationStageTrace.STAGE_TOTAL);
@@ -347,7 +347,7 @@ public class DefaultLogPublisher implements
MetricsInitializer {
.append(":\n");
PerfInfo prepare, queue, providerDecode, providerEncode, execute, sendResp;
for (OperationPerf operationPerf : perfGroup.getOperationPerfs()) {
- if (isIngoreEmptyPerf(operationPerf)) {
+ if (isIgnoreEmptyPerf(operationPerf)) {
continue;
}
prepare = operationPerf.findStage(InvocationStageTrace.STAGE_PREPARE);
@@ -385,7 +385,7 @@ public class DefaultLogPublisher implements
MetricsInitializer {
PerfInfo prepare, encodeRequest, decodeResponse, sendReq, getConnect,
waitResp;
for (OperationPerf operationPerf : perfGroup.getOperationPerfs()) {
- if (isIngoreEmptyPerf(operationPerf)) {
+ if (isIgnoreEmptyPerf(operationPerf)) {
continue;
}
prepare = operationPerf.findStage(InvocationStageTrace.STAGE_PREPARE);
@@ -424,7 +424,7 @@ public class DefaultLogPublisher implements
MetricsInitializer {
encodeConsumerRequest, decodeConsumerResponse, sendReq, getConnect,
waitResp, sendResp;
for (OperationPerf operationPerf : perfGroup.getOperationPerfs()) {
- if (isIngoreEmptyPerf(operationPerf)) {
+ if (isIgnoreEmptyPerf(operationPerf)) {
continue;
}
prepare = operationPerf.findStage(InvocationStageTrace.STAGE_PREPARE);
@@ -456,7 +456,7 @@ public class DefaultLogPublisher implements
MetricsInitializer {
return sb;
}
- private boolean isIngoreEmptyPerf(OperationPerf operationPerf) {
+ private boolean isIgnoreEmptyPerf(OperationPerf operationPerf) {
PerfInfo stageTotal =
operationPerf.findStage(InvocationStageTrace.STAGE_TOTAL);
// max latency is calculated in ring algorithm, maybe not 0
if (Double.compare(0D, stageTotal.getTotalRequests()) == 0
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
index 4aa0e848b..a7851d791 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/engine/SwaggerEnvironment.java
@@ -34,7 +34,7 @@ import
org.apache.servicecomb.swagger.invocation.arguments.consumer.ConsumerCont
import
org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerArgumentsMapper;
import
org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerArgumentsMapperCreator;
import
org.apache.servicecomb.swagger.invocation.arguments.producer.ProducerContextArgumentMapperFactory;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
import
org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapper;
import
org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory;
import
org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapper;
@@ -58,8 +58,8 @@ public class SwaggerEnvironment {
.getOrLoadSortedService(ConsumerContextArgumentMapperFactory.class)
.stream()
.collect(Collectors.toMap(ConsumerContextArgumentMapperFactory::getContextClass,
Function.identity()));
- ResponseMapperFactorys<ConsumerResponseMapper>
consumerResponseMapperFactorys =
- new ResponseMapperFactorys<>(ConsumerResponseMapperFactory.class);
+ ResponseMapperFactories<ConsumerResponseMapper>
consumerResponseMapperFactories =
+ new ResponseMapperFactories<>(ConsumerResponseMapperFactory.class);
SwaggerOperations swaggerOperations = new SwaggerOperations(swagger);
@@ -84,7 +84,7 @@ public class SwaggerEnvironment {
consumerMethod,
swaggerOperation);
ArgumentsMapper argsMapper = creator.createArgumentsMapper();
- ConsumerResponseMapper responseMapper = consumerResponseMapperFactorys
+ ConsumerResponseMapper responseMapper = consumerResponseMapperFactories
.createResponseMapper(consumerMethod.getGenericReturnType());
SwaggerConsumerOperation op = new SwaggerConsumerOperation();
@@ -123,8 +123,8 @@ public class SwaggerEnvironment {
.getOrLoadSortedService(ProducerContextArgumentMapperFactory.class)
.stream()
.collect(Collectors.toMap(ProducerContextArgumentMapperFactory::getContextClass,
Function.identity()));
- ResponseMapperFactorys<ProducerResponseMapper>
producerResponseMapperFactorys =
- new ResponseMapperFactorys<>(ProducerResponseMapperFactory.class);
+ ResponseMapperFactories<ProducerResponseMapper>
producerResponseMapperFactories =
+ new ResponseMapperFactories<>(ProducerResponseMapperFactory.class);
SwaggerOperations swaggerOperations = new SwaggerOperations(swagger);
@@ -153,7 +153,7 @@ public class SwaggerEnvironment {
producerMethod,
swaggerOperation);
ProducerArgumentsMapper argsMapper = creator.createArgumentsMapper();
- ProducerResponseMapper responseMapper =
producerResponseMapperFactorys.createResponseMapper(
+ ProducerResponseMapper responseMapper =
producerResponseMapperFactories.createResponseMapper(
producerMethod.getGenericReturnType());
SwaggerProducerOperation op = new SwaggerProducerOperation();
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactorys.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactories.java
similarity index 79%
rename from
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactorys.java
rename to
swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactories.java
index 0cbb2612e..761149ae2 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactorys.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactories.java
@@ -21,16 +21,16 @@ import java.util.List;
import org.apache.servicecomb.foundation.common.utils.SPIServiceUtils;
-public class ResponseMapperFactorys<MAPPER> {
- private final List<ResponseMapperFactory<MAPPER>> factorys;
+public class ResponseMapperFactories<MAPPER> {
+ private final List<ResponseMapperFactory<MAPPER>> factories;
@SuppressWarnings("unchecked")
- public ResponseMapperFactorys(Class<? extends ResponseMapperFactory<MAPPER>>
factoryCls) {
- factorys = (List<ResponseMapperFactory<MAPPER>>)
SPIServiceUtils.getSortedService(factoryCls);
+ public ResponseMapperFactories(Class<? extends
ResponseMapperFactory<MAPPER>> factoryCls) {
+ factories = (List<ResponseMapperFactory<MAPPER>>)
SPIServiceUtils.getSortedService(factoryCls);
}
public MAPPER createResponseMapper(Type providerType) {
- for (ResponseMapperFactory<MAPPER> factory : factorys) {
+ for (ResponseMapperFactory<MAPPER> factory : factories) {
if (!factory.isMatch(providerType)) {
continue;
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java
index 73a2f1a4f..f88b7af13 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/ResponseMapperFactory.java
@@ -25,5 +25,5 @@ public interface ResponseMapperFactory<MAPPER> {
boolean isMatch(Type providerType);
- MAPPER createResponseMapper(ResponseMapperFactorys<MAPPER> factorys, Type
providerType);
+ MAPPER createResponseMapper(ResponseMapperFactories<MAPPER> factorys, Type
providerType);
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java
index eabe5fdba..4ba292e99 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CompletableFutureConsumerResponseMapperFactory.java
@@ -20,7 +20,7 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.concurrent.CompletableFuture;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class CompletableFutureConsumerResponseMapperFactory implements
ConsumerResponseMapperFactory {
@Override
@@ -33,7 +33,7 @@ public class CompletableFutureConsumerResponseMapperFactory
implements ConsumerR
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactorys<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
Type consumerType) {
Type realConsumerType = ((ParameterizedType)
consumerType).getActualTypeArguments()[0];
return factorys.createResponseMapper(realConsumerType);
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java
index 34fcafd5e..af7fc67d0 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/CseResponseConsumerResponseMapperFactory.java
@@ -19,7 +19,7 @@ package
org.apache.servicecomb.swagger.invocation.response.consumer;
import java.lang.reflect.Type;
import org.apache.servicecomb.swagger.invocation.Response;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class CseResponseConsumerResponseMapperFactory implements
ConsumerResponseMapperFactory {
private static final ConsumerResponseMapper SAME = response -> response;
@@ -30,7 +30,7 @@ public class CseResponseConsumerResponseMapperFactory
implements ConsumerRespons
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactorys<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
Type consumerType) {
return SAME;
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java
index 0dd56c0d6..3d07da389 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/DefaultConsumerResponseMapperFactory.java
@@ -18,7 +18,7 @@ package
org.apache.servicecomb.swagger.invocation.response.consumer;
import java.lang.reflect.Type;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class DefaultConsumerResponseMapperFactory implements
ConsumerResponseMapperFactory {
@Override
@@ -32,7 +32,7 @@ public class DefaultConsumerResponseMapperFactory implements
ConsumerResponseMap
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactorys<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
Type consumerType) {
return new DefaultConsumerResponseMapper();
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java
index 8c08afde5..a6fb8bc2a 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/consumer/OptionalConsumerResponseMapperFactory.java
@@ -20,7 +20,7 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Optional;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class OptionalConsumerResponseMapperFactory implements
ConsumerResponseMapperFactory {
@Override
@@ -33,7 +33,7 @@ public class OptionalConsumerResponseMapperFactory implements
ConsumerResponseMa
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactorys<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
Type consumerType) {
Type realConsumerType = ((ParameterizedType)
consumerType).getActualTypeArguments()[0];
ConsumerResponseMapper realMapper =
factorys.createResponseMapper(realConsumerType);
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java
index 547671925..4ac1be225 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CompletableFutureProducerResponseMapperFactory.java
@@ -20,7 +20,7 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.concurrent.CompletableFuture;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class CompletableFutureProducerResponseMapperFactory implements
ProducerResponseMapperFactory {
@Override
@@ -33,7 +33,7 @@ public class CompletableFutureProducerResponseMapperFactory
implements ProducerR
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactorys<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
Type producerType) {
Type realProducerType = ((ParameterizedType)
producerType).getActualTypeArguments()[0];
return factorys.createResponseMapper(realProducerType);
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java
index 443487293..79d27c5fa 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/CseResponseProducerResponseMapperFactory.java
@@ -19,7 +19,7 @@ package
org.apache.servicecomb.swagger.invocation.response.producer;
import java.lang.reflect.Type;
import org.apache.servicecomb.swagger.invocation.Response;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class CseResponseProducerResponseMapperFactory implements
ProducerResponseMapperFactory {
private static final ProducerResponseMapper SAME = (status, response) ->
(Response) response;
@@ -30,7 +30,7 @@ public class CseResponseProducerResponseMapperFactory
implements ProducerRespons
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactorys<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
Type producerType) {
return SAME;
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java
index dbf1df3bb..06418c15b 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/DefaultProducerResponseMapperFactory.java
@@ -18,7 +18,7 @@ package
org.apache.servicecomb.swagger.invocation.response.producer;
import java.lang.reflect.Type;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class DefaultProducerResponseMapperFactory implements
ProducerResponseMapperFactory {
@Override
@@ -32,7 +32,7 @@ public class DefaultProducerResponseMapperFactory implements
ProducerResponseMap
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactorys<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
Type producerType) {
return new DefaultProducerResponseMapper();
}
diff --git
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java
index b7b45a1d1..06a793657 100644
---
a/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-core/src/main/java/org/apache/servicecomb/swagger/invocation/response/producer/OptionalProducerResponseMapperFactory.java
@@ -20,7 +20,7 @@ import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Optional;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
public class OptionalProducerResponseMapperFactory implements
ProducerResponseMapperFactory {
@Override
@@ -33,7 +33,7 @@ public class OptionalProducerResponseMapperFactory implements
ProducerResponseMa
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactorys<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
Type producerType) {
Type realProducerType = ((ParameterizedType)
producerType).getActualTypeArguments()[0];
ProducerResponseMapper realMapper =
factorys.createResponseMapper(realProducerType);
diff --git
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactories.java
similarity index 98%
rename from
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java
rename to
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactories.java
index af443db95..6a198088e 100644
---
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactorys.java
+++
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/consumer/TestConsumerResponseMapperFactories.java
@@ -35,7 +35,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.models.OpenAPI;
-public class TestConsumerResponseMapperFactorys {
+public class TestConsumerResponseMapperFactories {
interface ConsumerResponseForTest {
String normal();
diff --git
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactorys.java
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactories.java
similarity index 98%
rename from
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactorys.java
rename to
swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactories.java
index c576bae5d..fd0fec593 100644
---
a/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactorys.java
+++
b/swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/response/producer/TestProducerResponseMapperFactories.java
@@ -34,7 +34,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import jakarta.ws.rs.core.Response.Status;
-public class TestProducerResponseMapperFactorys {
+public class TestProducerResponseMapperFactories {
static class ResponseForTest {
public String normal() {
return "normal";
diff --git
a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java
index 241decec2..689cdcb25 100644
---
a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsConsumerResponseMapperFactory.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Type;
import jakarta.ws.rs.core.Response;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
import
org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapper;
import
org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory;
@@ -31,7 +31,7 @@ public class JaxrsConsumerResponseMapperFactory implements
ConsumerResponseMappe
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactorys<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
Type consumerType) {
return new JaxrsConsumerResponseMapper();
}
diff --git
a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java
index e36e49407..9ae523d35 100644
---
a/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-jaxrs/src/main/java/org/apache/servicecomb/swagger/invocation/jaxrs/response/JaxrsProducerResponseMapperFactory.java
@@ -20,7 +20,7 @@ import java.lang.reflect.Type;
import jakarta.ws.rs.core.Response;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
import
org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapper;
import
org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory;
@@ -31,7 +31,7 @@ public class JaxrsProducerResponseMapperFactory implements
ProducerResponseMappe
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactorys<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
Type producerType) {
return new JaxrsProducerResponseMapper();
}
diff --git
a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java
index 9fa48f715..89bd9a76e 100644
---
a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcConsumerResponseMapperFactory.java
@@ -19,7 +19,7 @@ package
org.apache.servicecomb.swagger.invocation.springmvc.response;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
import
org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapper;
import
org.apache.servicecomb.swagger.invocation.response.consumer.ConsumerResponseMapperFactory;
import org.springframework.http.ResponseEntity;
@@ -35,7 +35,7 @@ public class SpringmvcConsumerResponseMapperFactory
implements ConsumerResponseM
}
@Override
- public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactorys<ConsumerResponseMapper> factorys,
+ public ConsumerResponseMapper
createResponseMapper(ResponseMapperFactories<ConsumerResponseMapper> factorys,
Type consumerType) {
Type realConsumerType = ((ParameterizedType)
consumerType).getActualTypeArguments()[0];
ConsumerResponseMapper realMapper =
factorys.createResponseMapper(realConsumerType);
diff --git
a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java
index c3bee1c34..6f95ec287 100644
---
a/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-springmvc/src/main/java/org/apache/servicecomb/swagger/invocation/springmvc/response/SpringmvcProducerResponseMapperFactory.java
@@ -19,7 +19,7 @@ package
org.apache.servicecomb.swagger.invocation.springmvc.response;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
import
org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapper;
import
org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory;
import org.springframework.http.ResponseEntity;
@@ -35,7 +35,7 @@ public class SpringmvcProducerResponseMapperFactory
implements ProducerResponseM
}
@Override
- public ProducerResponseMapper
createResponseMapper(ResponseMapperFactorys<ProducerResponseMapper> factorys,
+ public ProducerResponseMapper
createResponseMapper(ResponseMapperFactories<ProducerResponseMapper> factorys,
Type producerType) {
Type realProducerType = ((ParameterizedType)
producerType).getActualTypeArguments()[0];
ProducerResponseMapper realMapper =
factorys.createResponseMapper(realProducerType);
diff --git
a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java
b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java
index 5407786ea..dddf4447d 100644
---
a/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java
+++
b/swagger/swagger-invocation/invocation-springmvc/src/test/java/org/apache/servicecomb/swagger/invocation/springmvc/response/TestSpringmvcProducerResponseMapperFactory.java
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.servicecomb.foundation.common.utils.ReflectUtils;
import org.apache.servicecomb.swagger.invocation.Response;
-import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactorys;
+import
org.apache.servicecomb.swagger.invocation.response.ResponseMapperFactories;
import
org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapper;
import
org.apache.servicecomb.swagger.invocation.response.producer.ProducerResponseMapperFactory;
import org.hamcrest.MatcherAssert;
@@ -34,7 +34,7 @@ import org.springframework.http.ResponseEntity;
public class TestSpringmvcProducerResponseMapperFactory {
SpringmvcProducerResponseMapperFactory factory = new
SpringmvcProducerResponseMapperFactory();
- ResponseMapperFactorys<ProducerResponseMapper> factorys = new
ResponseMapperFactorys<>(
+ ResponseMapperFactories<ProducerResponseMapper> factorys = new
ResponseMapperFactories<>(
ProducerResponseMapperFactory.class);
public ResponseEntity<String[]> responseEntity() {
