Skip to content

Commit ad242f4

Browse files
authored
Improve bean name to avoid conflicts with other frameworks (#4602)
1 parent ff30f5c commit ad242f4

File tree

51 files changed

+231
-205
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+231
-205
lines changed

common/common-access-log/src/main/java/org/apache/servicecomb/common/accessLog/AccessLogConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
@Configuration
2323
public class AccessLogConfiguration {
2424
@Bean
25-
public AccessLogBootListener accessLogBootListener() {
25+
public AccessLogBootListener scbAccessLogBootListener() {
2626
return new AccessLogBootListener();
2727
}
2828
}

common/common-rest/src/main/java/org/apache/servicecomb/common/rest/CommonRestConfiguration.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,47 +33,47 @@
3333
@Configuration
3434
public class CommonRestConfiguration {
3535
@Bean
36-
public QueryCodecCsv queryCodecCsv() {
36+
public QueryCodecCsv scbQueryCodecCsv() {
3737
return new QueryCodecCsv();
3838
}
3939

4040
@Bean
41-
public QueryCodecSsv queryCodecSsv() {
41+
public QueryCodecSsv scbQueryCodecSsv() {
4242
return new QueryCodecSsv();
4343
}
4444

4545
@Bean
46-
public QueryCodecPipes queryCodecPipes() {
46+
public QueryCodecPipes scbQueryCodecPipes() {
4747
return new QueryCodecPipes();
4848
}
4949

5050
@Bean
51-
public QueryCodecMulti queryCodecMulti() {
51+
public QueryCodecMulti scbQueryCodecMulti() {
5252
return new QueryCodecMulti();
5353
}
5454

5555
@Bean
56-
public QueryCodecsUtils queryCodecsUtils(QueryCodecs queryCodecs) {
56+
public QueryCodecsUtils scbQueryCodecsUtils(QueryCodecs queryCodecs) {
5757
return new QueryCodecsUtils(queryCodecs);
5858
}
5959

6060
@Bean
61-
public RestServerCodecFilter restServerCodecFilter() {
61+
public RestServerCodecFilter scbRestServerCodecFilter() {
6262
return new RestServerCodecFilter();
6363
}
6464

6565
@Bean
66-
public WebSocketServerCodecFilter webSocketServerCodecFilter() {
66+
public WebSocketServerCodecFilter scbWebSocketServerCodecFilter() {
6767
return new WebSocketServerCodecFilter();
6868
}
6969

7070
@Bean
71-
public QueryCodecs queryCodecs(List<QueryCodec> orderedCodecs) {
71+
public QueryCodecs scbQueryCodecs(List<QueryCodec> orderedCodecs) {
7272
return new QueryCodecs(orderedCodecs);
7373
}
7474

7575
@Bean
76-
public RestEngineSchemaListener restEngineSchemaListener() {
76+
public RestEngineSchemaListener scbRestEngineSchemaListener() {
7777
return new RestEngineSchemaListener();
7878
}
7979
}

core/src/main/java/org/apache/servicecomb/core/ServiceCombCoreConfiguration.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,65 +49,65 @@ public SCBEngine scbEngine() {
4949
}
5050

5151
@Bean
52-
public ConsumerProviderManager consumerProviderManager(Environment environment,
52+
public ConsumerProviderManager scbConsumerProviderManager(Environment environment,
5353
OpenAPIRegistryManager openAPIRegistryManager) {
5454
return new ConsumerProviderManager(environment, openAPIRegistryManager);
5555
}
5656

5757
@Bean
58-
public ReferenceConfigManager referenceConfigManager() {
58+
public ReferenceConfigManager scbReferenceConfigManager() {
5959
return new ReferenceConfigManager();
6060
}
6161

6262
@Bean
63-
public OpenAPIRegistryManager openAPIRegistryManager() {
63+
public OpenAPIRegistryManager scbOpenAPIRegistryManager() {
6464
return new OpenAPIRegistryManager();
6565
}
6666

6767
@Bean
68-
public LocalOpenAPIRegistry localOpenAPIRegistry(Environment environment) {
68+
public LocalOpenAPIRegistry scbLocalOpenAPIRegistry(Environment environment) {
6969
return new LocalOpenAPIRegistry(environment);
7070
}
7171

7272
@Bean
73-
public RegistryOpenAPIRegistry registryOpenAPIRegistry() {
73+
public RegistryOpenAPIRegistry scbRegistryOpenAPIRegistry() {
7474
return new RegistryOpenAPIRegistry();
7575
}
7676

7777
@Bean
78-
public ProducerBootListener producerBootListener() {
78+
public ProducerBootListener scbProducerBootListener() {
7979
return new ProducerBootListener();
8080
}
8181

8282
@Bean
83-
public FilterChainCollector filterChainCollector() {
83+
public FilterChainCollector scbFilterChainCollector() {
8484
return new FilterChainCollector();
8585
}
8686

8787
@Bean
88-
public ConfigurationProblemsCollector configurationProblemsCollector() {
88+
public ConfigurationProblemsCollector scbConfigurationProblemsCollector() {
8989
return new ConfigurationProblemsCollector();
9090
}
9191

9292
@Bean
93-
public ServiceInformationCollector serviceInformationCollector() {
93+
public ServiceInformationCollector scbServiceInformationCollector() {
9494
return new ServiceInformationCollector();
9595
}
9696

9797
@Bean
98-
public ExecutorManager executorManager() {
98+
public ExecutorManager scbExecutorManager() {
9999
return new ExecutorManager();
100100
}
101101

102102
@Bean(value = {"cse.executor.groupThreadPool", "cse.executor.default", "servicecomb.executor.groupThreadPool"})
103-
public GroupExecutor groupExecutor(Environment environment) {
103+
public GroupExecutor scbGroupExecutor(Environment environment) {
104104
GroupExecutor groupExecutor = new GroupExecutor(environment);
105105
groupExecutor.init();
106106
return groupExecutor;
107107
}
108108

109109
@Bean
110-
public TransportManager transportManager() {
110+
public TransportManager scbTransportManager() {
111111
return new TransportManager();
112112
}
113113
}

core/src/main/java/org/apache/servicecomb/core/exception/CoreExceptionConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@
2222
@Configuration
2323
public class CoreExceptionConfiguration {
2424
@Bean
25-
public Exceptions exceptions() {
25+
public Exceptions scbExceptions() {
2626
return new Exceptions();
2727
}
2828

2929
@Bean
30-
public DefaultExceptionProcessor defaultExceptionProcessor() {
30+
public DefaultExceptionProcessor scbDefaultExceptionProcessor() {
3131
return new DefaultExceptionProcessor();
3232
}
3333
}

core/src/main/java/org/apache/servicecomb/core/filter/CoreFilterConfiguration.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,32 +29,32 @@
2929
@Configuration
3030
public class CoreFilterConfiguration {
3131
@Bean
32-
public ProviderOperationFilter producerOperationFilter() {
32+
public ProviderOperationFilter scbProducerOperationFilter() {
3333
return new ProviderOperationFilter();
3434
}
3535

3636
@Bean
37-
public ScheduleFilter scheduleFilter() {
37+
public ScheduleFilter scbScheduleFilter() {
3838
return new ScheduleFilter();
3939
}
4040

4141
@Bean
42-
public RetryFilter retryFilter(RetryHandler retryHandler) {
42+
public RetryFilter scbRetryFilter(RetryHandler retryHandler) {
4343
return new RetryFilter(retryHandler);
4444
}
4545

4646
@Bean
47-
public ContextMapperFilter contextMapperFilter(MapperHandler mapperHandler) {
47+
public ContextMapperFilter scbContextMapperFilter(MapperHandler mapperHandler) {
4848
return new ContextMapperFilter(mapperHandler);
4949
}
5050

5151
@Bean
52-
public FilterChainsManager filterChainsManager() {
52+
public FilterChainsManager scbFilterChainsManager() {
5353
return new FilterChainsManager();
5454
}
5555

5656
@Bean
57-
public ParameterValidatorFilter parameterValidatorFilter() {
57+
public ParameterValidatorFilter scbParameterValidatorFilter() {
5858
return new ParameterValidatorFilter();
5959
}
6060
}

core/src/main/java/org/apache/servicecomb/core/invocation/CoreInvocationConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,19 @@
2929
@Configuration
3030
public class CoreInvocationConfiguration {
3131
@Bean
32-
public InvocationTimeoutBootListener invocationTimeoutBootListener(EventBus eventBus,
32+
public InvocationTimeoutBootListener scbInvocationTimeoutBootListener(EventBus eventBus,
3333
List<InvocationTimeoutStrategy> strategies,
3434
Environment environment) {
3535
return new InvocationTimeoutBootListener(eventBus, strategies, environment);
3636
}
3737

3838
@Bean
39-
public PassingTimeStrategy passingTimeStrategy() {
39+
public PassingTimeStrategy scbPassingTimeStrategy() {
4040
return new PassingTimeStrategy();
4141
}
4242

4343
@Bean
44-
public ProcessingTimeStrategy processingTimeStrategy() {
44+
public ProcessingTimeStrategy scbProcessingTimeStrategy() {
4545
return new ProcessingTimeStrategy();
4646
}
4747
}

edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeCoreConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@
2323
@Configuration
2424
public class EdgeCoreConfiguration {
2525
@Bean
26-
public EdgeBootListener edgeBootListener() {
26+
public EdgeBootListener scbEdgeBootListener() {
2727
return new EdgeBootListener();
2828
}
2929

3030
@Bean
31-
public EdgeAddHeaderFilter edgeAddHeaderFilter(Environment environment) {
31+
public EdgeAddHeaderFilter scbEdgeAddHeaderFilter(Environment environment) {
3232
return new EdgeAddHeaderFilter(environment);
3333
}
3434
}

foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/auth/FoundationCommonAuthConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
@Configuration
2222
public class FoundationCommonAuthConfiguration {
23-
public ShaAKSKCipher shaAKSKCipher() {
23+
public ShaAKSKCipher scbShaAKSKCipher() {
2424
return new ShaAKSKCipher();
2525
}
2626
}

foundations/foundation-common/src/main/java/org/apache/servicecomb/foundation/common/event/EventManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public static void unregister(Object listener) {
5656
}
5757

5858
@Bean
59-
public EventBus eventBus() {
59+
public EventBus scbEventBus() {
6060
return eventBus;
6161
}
6262
}

foundations/foundation-config/src/main/java/org/apache/servicecomb/config/FoundationConfigConfiguration.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,39 +31,39 @@
3131
@SuppressWarnings("unused")
3232
public class FoundationConfigConfiguration {
3333
@Bean
34-
public static InjectBeanPostProcessor injectBeanPostProcessor(
34+
public static InjectBeanPostProcessor scbInjectBeanPostProcessor(
3535
@Autowired @Lazy PriorityPropertyManager priorityPropertyManager) {
3636
return new InjectBeanPostProcessor(priorityPropertyManager);
3737
}
3838

3939
@Bean
40-
public PriorityPropertyManager priorityPropertyManager(ConfigObjectFactory configObjectFactory) {
40+
public PriorityPropertyManager scbPriorityPropertyManager(ConfigObjectFactory configObjectFactory) {
4141
return new PriorityPropertyManager(configObjectFactory);
4242
}
4343

4444
@Bean
45-
public PriorityPropertyFactory priorityPropertyFactory(Environment environment) {
45+
public PriorityPropertyFactory scbPriorityPropertyFactory(Environment environment) {
4646
return new PriorityPropertyFactory(environment);
4747
}
4848

4949
@Bean
50-
public DynamicPropertiesImpl dynamicProperties(Environment environment) {
50+
public DynamicPropertiesImpl scbDynamicProperties(Environment environment) {
5151
return new DynamicPropertiesImpl(environment);
5252
}
5353

5454
@Bean
55-
public ConfigObjectFactory configObjectFactory(PriorityPropertyFactory propertyFactory) {
55+
public ConfigObjectFactory scbConfigObjectFactory(PriorityPropertyFactory propertyFactory) {
5656
return new ConfigObjectFactory(propertyFactory);
5757
}
5858

5959
@Bean
6060
@ConfigurationProperties(prefix = DataCenterProperties.PREFIX)
61-
public DataCenterProperties dataCenterProperties() {
61+
public DataCenterProperties scbDataCenterProperties() {
6262
return new DataCenterProperties();
6363
}
6464

6565
@Bean
66-
public InMemoryDynamicPropertiesSource inMemoryDynamicPropertiesSource() {
66+
public InMemoryDynamicPropertiesSource scbInMemoryDynamicPropertiesSource() {
6767
return new InMemoryDynamicPropertiesSource();
6868
}
6969
}

0 commit comments

Comments
 (0)