This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new f245b22 SCB-1124 Rename the Handler name of Omega transport
f245b22 is described below
commit f245b22df3bd8146ee42b167834211c3c19ed212
Author: Willem Jiang <[email protected]>
AuthorDate: Tue Jan 22 16:14:51 2019 +0800
SCB-1124 Rename the Handler name of Omega transport
---
.../scb-booking/src/main/resources/microservice.yaml | 4 ++--
.../scb-car/src/main/resources/microservice.yaml | 4 ++--
.../scb-hotel/src/main/resources/microservice.yaml | 4 ++--
...{SagaDubboConsumerFilter.java => PackDubboConsumerFilter.java} | 2 +-
...{SagaDubboProviderFilter.java => PackDubboProviderFilter.java} | 2 +-
.../main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter | 4 ++--
...boConsumerFilterTest.java => PackDubboConsumerFilterTest.java} | 5 ++---
...boProviderFilterTest.java => PackDubboProviderFilterTest.java} | 4 ++--
.../{SagaConsumerHandler.java => PackConsumerHandler.java} | 6 +++---
.../{SagaProviderHandler.java => PackProviderHandler.java} | 6 +++---
.../src/main/resources/config/cse.handler.xml | 8 ++++----
...{SagaConsumerHandlerTest.java => PackConsumerHandlerTest.java} | 4 ++--
...{SagaProviderHandlerTest.java => PackProviderHandlerTest.java} | 4 ++--
13 files changed, 28 insertions(+), 29 deletions(-)
diff --git
a/demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml
b/demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml
index 4b1ee07..26260fa 100644
---
a/demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml
+++
b/demo/saga-servicecomb-demo/scb-booking/src/main/resources/microservice.yaml
@@ -39,8 +39,8 @@ servicecomb:
rest:
address: 0.0.0.0:8083
- #Add Saga Handler
+ #Add Pack Handler
handler:
chain:
Consumer:
- default: loadbalance,saga-consumer
\ No newline at end of file
+ default: loadbalance,pack-consumer
diff --git
a/demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml
b/demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml
index 20927bf..45e3d5b 100644
--- a/demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml
+++ b/demo/saga-servicecomb-demo/scb-car/src/main/resources/microservice.yaml
@@ -39,8 +39,8 @@ servicecomb:
rest:
address: 0.0.0.0:8082
- #Add Saga Handler
+ #Add Pack Handler
handler:
chain:
Provider:
- default: saga-provider
\ No newline at end of file
+ default: pack-provider
diff --git
a/demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml
b/demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml
index 40a453b..d48a11c 100644
--- a/demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml
+++ b/demo/saga-servicecomb-demo/scb-hotel/src/main/resources/microservice.yaml
@@ -39,8 +39,8 @@ servicecomb:
rest:
address: 0.0.0.0:8081
- #Add Saga Handler
+ #Add Pack Handler
handler:
chain:
Provider:
- default: saga-provider
\ No newline at end of file
+ default: pack-provider
diff --git
a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboConsumerFilter.java
similarity index 97%
rename from
omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
rename to
omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboConsumerFilter.java
index 6261cc5..0024111 100644
---
a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilter.java
+++
b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboConsumerFilter.java
@@ -39,7 +39,7 @@ import static
org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID
* add saga transaction id to dubbo invocation
*/
@Activate(group = {Constants.CONSUMER})
-public class SagaDubboConsumerFilter implements Filter {
+public class PackDubboConsumerFilter implements Filter {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// As we use the spring to manage the omegaContext, the Autowired work out
of box
diff --git
a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboProviderFilter.java
similarity index 98%
rename from
omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
rename to
omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboProviderFilter.java
index c871c9c..5322887 100644
---
a/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilter.java
+++
b/omega/omega-transport/omega-transport-dubbo/src/main/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboProviderFilter.java
@@ -34,7 +34,7 @@ import static
org.apache.servicecomb.pack.omega.context.OmegaContext.LOCAL_TX_ID
* get saga transaction id from dubbo invocation and set into omega context
*/
@Activate(group = Constants.PROVIDER)
-public class SagaDubboProviderFilter implements Filter {
+public class PackDubboProviderFilter implements Filter {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
diff --git
a/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
b/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
index 3505b4f..d408b90 100644
---
a/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
+++
b/omega/omega-transport/omega-transport-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
@@ -14,5 +14,5 @@
## See the License for the specific language governing permissions and
## limitations under the License.
## ---------------------------------------------------------------------------
-sagaDubboConsumerFilter=org.apache.servicecomb.pack.omega.transport.dubbo.SagaDubboConsumerFilter
-sageDubboProviderFilter=org.apache.servicecomb.pack.omega.transport.dubbo.SagaDubboProviderFilter
+packDubboConsumerFilter=org.apache.servicecomb.pack.omega.transport.dubbo.PackDubboConsumerFilter
+packDubboProviderFilter=org.apache.servicecomb.pack.omega.transport.dubbo.PackDubboProviderFilter
diff --git
a/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilterTest.java
b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboConsumerFilterTest.java
similarity index 93%
rename from
omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilterTest.java
rename to
omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboConsumerFilterTest.java
index 53049b2..b7cd67d 100644
---
a/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboConsumerFilterTest.java
+++
b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboConsumerFilterTest.java
@@ -21,7 +21,6 @@ import java.util.UUID;
import org.apache.servicecomb.pack.omega.context.IdGenerator;
import org.apache.servicecomb.pack.omega.context.OmegaContext;
-import
org.apache.servicecomb.pack.omega.transport.dubbo.SagaDubboConsumerFilter;
import org.junit.Before;
import org.junit.Test;
@@ -32,7 +31,7 @@ import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class SagaDubboConsumerFilterTest {
+public class PackDubboConsumerFilterTest {
private static final String globalTxId = UUID.randomUUID().toString();
private static final String localTxId = UUID.randomUUID().toString();
@@ -45,7 +44,7 @@ public class SagaDubboConsumerFilterTest {
}
});
private final Invocation invocation = mock(Invocation.class);
- private final SagaDubboConsumerFilter filter = new SagaDubboConsumerFilter();
+ private final PackDubboConsumerFilter filter = new PackDubboConsumerFilter();
@Before
public void setUp() {
diff --git
a/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilterTest.java
b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboProviderFilterTest.java
similarity index 96%
rename from
omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilterTest.java
rename to
omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboProviderFilterTest.java
index d6e3247..010e16b 100644
---
a/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/SagaDubboProviderFilterTest.java
+++
b/omega/omega-transport/omega-transport-dubbo/src/test/java/org/apache/servicecomb/pack/omega/transport/dubbo/PackDubboProviderFilterTest.java
@@ -34,7 +34,7 @@ import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-public class SagaDubboProviderFilterTest {
+public class PackDubboProviderFilterTest {
private static final String globalTxId = UUID.randomUUID().toString();
private static final String localTxId = UUID.randomUUID().toString();
@@ -47,7 +47,7 @@ public class SagaDubboProviderFilterTest {
private final Invocation invocation = mock(Invocation.class);
private final Invoker invoker = mock(Invoker.class);
- private final SagaDubboProviderFilter filter = new SagaDubboProviderFilter();
+ private final PackDubboProviderFilter filter = new PackDubboProviderFilter();
@Before
public void setUp() {
diff --git
a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackConsumerHandler.java
similarity index 94%
rename from
omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
rename to
omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackConsumerHandler.java
index 2549244..99a203e 100644
---
a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandler.java
+++
b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackConsumerHandler.java
@@ -30,13 +30,13 @@ import
org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SagaConsumerHandler implements Handler {
+public class PackConsumerHandler implements Handler {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final OmegaContext omegaContext;
- public SagaConsumerHandler() {
+ public PackConsumerHandler() {
OmegaContext context = null;
try {
context = BeanUtils.getBean("omegaContext");
@@ -46,7 +46,7 @@ public class SagaConsumerHandler implements Handler {
this.omegaContext = context;
}
- public SagaConsumerHandler(OmegaContext omegaContext) {
+ public PackConsumerHandler(OmegaContext omegaContext) {
this.omegaContext = omegaContext;
}
diff --git
a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackProviderHandler.java
similarity index 95%
rename from
omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
rename to
omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackProviderHandler.java
index dc2574d..5db6a0a 100644
---
a/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandler.java
+++
b/omega/omega-transport/omega-transport-servicecomb/src/main/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackProviderHandler.java
@@ -34,13 +34,13 @@ import org.slf4j.LoggerFactory;
* This provider is setup the OmegaContext before the application invocation.
* Please make sure this handler is last one to use on the ServiceComb
java-chassis application
*/
-public class SagaProviderHandler implements Handler {
+public class PackProviderHandler implements Handler {
private static final Logger LOG =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private final OmegaContext omegaContext;
- public SagaProviderHandler() {
+ public PackProviderHandler() {
OmegaContext context = null;
try {
context = BeanUtils.getBean("omegaContext");
@@ -50,7 +50,7 @@ public class SagaProviderHandler implements Handler {
this.omegaContext = context;
}
- public SagaProviderHandler(OmegaContext omegaContext) {
+ public PackProviderHandler(OmegaContext omegaContext) {
this.omegaContext = omegaContext;
}
diff --git
a/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml
b/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml
index 29bb572..94c37fa 100644
---
a/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml
+++
b/omega/omega-transport/omega-transport-servicecomb/src/main/resources/config/cse.handler.xml
@@ -16,8 +16,8 @@
-->
<config>
- <handler id="saga-consumer"
-
class="org.apache.servicecomb.pack.omega.transport.servicecomb.SagaConsumerHandler"
/>
- <handler id="saga-provider"
-
class="org.apache.servicecomb.pack.omega.transport.servicecomb.SagaProviderHandler"
/>
+ <handler id="pack-consumer"
+
class="org.apache.servicecomb.pack.omega.transport.servicecomb.PackConsumerHandler"
/>
+ <handler id="pack-provider"
+
class="org.apache.servicecomb.pack.omega.transport.servicecomb.PackProviderHandler"
/>
</config>
diff --git
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandlerTest.java
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackConsumerHandlerTest.java
similarity index 96%
rename from
omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandlerTest.java
rename to
omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackConsumerHandlerTest.java
index db5bf0c..4ee6ac3 100644
---
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaConsumerHandlerTest.java
+++
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackConsumerHandlerTest.java
@@ -33,7 +33,7 @@ import
org.apache.servicecomb.swagger.invocation.AsyncResponse;
import org.junit.Before;
import org.junit.Test;
-public class SagaConsumerHandlerTest {
+public class PackConsumerHandlerTest {
private static final String globalTxId = UUID.randomUUID().toString();
@@ -54,7 +54,7 @@ public class SagaConsumerHandlerTest {
private final AsyncResponse asyncResponse = mock(AsyncResponse.class);
- private final SagaConsumerHandler handler = new
SagaConsumerHandler(omegaContext);
+ private final PackConsumerHandler handler = new
PackConsumerHandler(omegaContext);
@Before
public void setUp() {
diff --git
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandlerTest.java
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackProviderHandlerTest.java
similarity index 97%
rename from
omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandlerTest.java
rename to
omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackProviderHandlerTest.java
index 1e0400d..fc84853 100644
---
a/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/SagaProviderHandlerTest.java
+++
b/omega/omega-transport/omega-transport-servicecomb/src/test/java/org/apache/servicecomb/pack/omega/transport/servicecomb/PackProviderHandlerTest.java
@@ -41,7 +41,7 @@ import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-public class SagaProviderHandlerTest {
+public class PackProviderHandlerTest {
private static final String globalTxId = UUID.randomUUID().toString();
@@ -59,7 +59,7 @@ public class SagaProviderHandlerTest {
private final AsyncResponse asyncResponse = mock(AsyncResponse.class);
- private final SagaProviderHandler handler = new
SagaProviderHandler(omegaContext);
+ private final PackProviderHandler handler = new
PackProviderHandler(omegaContext);
@Before
public void setUp() {
