SCB-1386 Polish the code and fix the integration test error

apache · Aug 1, 2019 · 158c295 · 158c295
1 parent 9183888
commit 158c295
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/...-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/SagaEnd.java b/...-context/src/main/java/org/apache/servicecomb/pack/omega/context/annotations/SagaEnd.java
@@ -17,7 +17,7 @@
 package org.apache.servicecomb.pack.omega.context.annotations;
 
 /**
- * Indicates once the annotated method is finised, it will end a saga.
+ * Indicates once the annotated method is finished, it will end a saga.
  */
 public class SagaEnd {
 

diff --git a/...ransaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaEndAspect.java b/...ransaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaEndAspect.java
@@ -21,7 +21,6 @@
 
 import org.apache.servicecomb.pack.omega.context.OmegaContext;
 import org.apache.servicecomb.pack.omega.context.annotations.SagaEnd;
-import org.apache.servicecomb.pack.omega.context.annotations.SagaStart;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
@@ -31,7 +30,7 @@
 import org.springframework.core.annotation.Order;
 
 @Aspect
-@Order(value = 100)
+@Order(value = 300)
 public class SagaEndAspect {
   private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   private final OmegaContext context;

diff --git a/...nsaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspect.java b/...nsaction/src/main/java/org/apache/servicecomb/pack/omega/transaction/SagaStartAspect.java
@@ -24,8 +24,10 @@
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.springframework.core.annotation.Order;
 
 @Aspect
+@Order(value = 100)
 public class SagaStartAspect {
 
   private final SagaStartAnnotationProcessor sagaStartAnnotationProcessor;

diff --git a/...action/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java b/...action/src/main/java/org/apache/servicecomb/pack/omega/transaction/TransactionAspect.java
@@ -32,7 +32,7 @@
 import org.springframework.core.annotation.Order;
 
 @Aspect
-@Order(value=10)
+@Order(value = 200)
 public class TransactionAspect extends TransactionContextHelper {
 
   private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());