[huaweicloud#922][huaweicloud#928]upgrade service comb version

liubao68 · Nov 21, 2022 · 9e19e61 · 9e19e61
1 parent 4763c35
commit 9e19e61
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/pom.xml b/pom.xml
@@ -40,7 +40,7 @@
     <spring.version>5.3.23</spring.version>
     <spring-cloud.version>2021.0.5</spring-cloud.version>
     <spring-boot.version>2.6.13</spring-boot.version>
-    <servicecomb.version>2.7.10</servicecomb.version>
+    <servicecomb.version>2.8.3</servicecomb.version>
   </properties>
 
   <modules>

diff --git a/...on/src/main/java/com/huaweicloud/common/adapters/loadbalancer/RetryAwareLoadBalancer.java b/...on/src/main/java/com/huaweicloud/common/adapters/loadbalancer/RetryAwareLoadBalancer.java
@@ -22,7 +22,7 @@
 
 import org.apache.servicecomb.governance.handler.LoadBalanceHandler;
 import org.apache.servicecomb.governance.marker.GovernanceRequest;
-import org.apache.servicecomb.loadbanlance.LoadBalance;
+import org.apache.servicecomb.governance.processor.loadbanlance.LoadBalance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.ObjectProvider;

diff --git a/.../com/huaweicloud/governance/adapters/feign/GovernanceFeignBlockingLoadBalancerClient.java b/.../com/huaweicloud/governance/adapters/feign/GovernanceFeignBlockingLoadBalancerClient.java
@@ -35,10 +35,10 @@
 import org.apache.servicecomb.governance.marker.GovernanceRequest;
 import org.apache.servicecomb.governance.policy.CircuitBreakerPolicy;
 import org.apache.servicecomb.governance.policy.RetryPolicy;
+import org.apache.servicecomb.governance.processor.injection.Fault;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.apache.servicecomb.http.client.common.HttpUtils;
-import org.apache.servicecomb.injection.Fault;
-import org.apache.servicecomb.injection.FaultInjectionDecorators;
-import org.apache.servicecomb.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.apache.servicecomb.service.center.client.DiscoveryEvents.PullInstanceEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...src/main/java/com/huaweicloud/governance/adapters/gateway/FaultInjectionGlobalFilter.java b/...src/main/java/com/huaweicloud/governance/adapters/gateway/FaultInjectionGlobalFilter.java
@@ -21,10 +21,10 @@
 
 import org.apache.servicecomb.governance.handler.FaultInjectionHandler;
 import org.apache.servicecomb.governance.marker.GovernanceRequest;
+import org.apache.servicecomb.governance.processor.injection.Fault;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.apache.servicecomb.http.client.common.HttpUtils;
-import org.apache.servicecomb.injection.Fault;
-import org.apache.servicecomb.injection.FaultInjectionDecorators;
-import org.apache.servicecomb.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.springframework.cloud.gateway.filter.GatewayFilterChain;
 import org.springframework.cloud.gateway.filter.GlobalFilter;
 import org.springframework.cloud.gateway.filter.ReactiveLoadBalancerClientFilter;

diff --git a/...ernance/src/main/java/com/huaweicloud/governance/adapters/web/GovernanceRestTemplate.java b/...ernance/src/main/java/com/huaweicloud/governance/adapters/web/GovernanceRestTemplate.java
@@ -24,10 +24,10 @@
 import org.apache.servicecomb.governance.handler.RetryHandler;
 import org.apache.servicecomb.governance.marker.GovernanceRequest;
 import org.apache.servicecomb.governance.policy.RetryPolicy;
+import org.apache.servicecomb.governance.processor.injection.Fault;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.apache.servicecomb.http.client.common.HttpUtils;
-import org.apache.servicecomb.injection.Fault;
-import org.apache.servicecomb.injection.FaultInjectionDecorators;
-import org.apache.servicecomb.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.client.ClientHttpRequest;
 import org.springframework.http.client.ClientHttpResponse;

diff --git a/...a/com/huaweicloud/governance/adapters/webclient/FaultInjectionExchangeFilterFunction.java b/...a/com/huaweicloud/governance/adapters/webclient/FaultInjectionExchangeFilterFunction.java
@@ -19,10 +19,10 @@
 
 import org.apache.servicecomb.governance.handler.FaultInjectionHandler;
 import org.apache.servicecomb.governance.marker.GovernanceRequest;
+import org.apache.servicecomb.governance.processor.injection.Fault;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators;
+import org.apache.servicecomb.governance.processor.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.apache.servicecomb.http.client.common.HttpUtils;
-import org.apache.servicecomb.injection.Fault;
-import org.apache.servicecomb.injection.FaultInjectionDecorators;
-import org.apache.servicecomb.injection.FaultInjectionDecorators.FaultInjectionDecorateCheckedSupplier;
 import org.springframework.core.Ordered;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;