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/incubator-servicecomb-saga.git
commit 9ef3cb256414b123a38a3969fca1beff6fb68d19 Author: seanyinx <[email protected]> AuthorDate: Fri Dec 22 17:26:39 2017 +0800 SCB-96 separated spring related classes to a different module Signed-off-by: seanyinx <[email protected]> --- .../{omega-transaction => omega-spring-tx}/pom.xml | 10 ++++++---- .../spring}/TransactionAspectConfig.java | 6 +++++- .../spring}/TransactionInterceptionTest.java | 6 ++++-- .../transaction/spring}/TransactionTestMain.java | 2 +- .../spring}/TransactionalUserService.java | 2 +- .../saga/omega/transaction/spring}/User.java | 8 ++++---- .../omega/transaction/spring}/UserRepository.java | 4 ++-- omega/omega-transaction/pom.xml | 23 ++++++---------------- .../saga/omega/transaction/TransactionAspect.java | 4 ++-- omega/pom.xml | 6 ++++++ 10 files changed, 37 insertions(+), 34 deletions(-) diff --git a/omega/omega-transaction/pom.xml b/omega/omega-spring-tx/pom.xml similarity index 93% copy from omega/omega-transaction/pom.xml copy to omega/omega-spring-tx/pom.xml index 1de2909..b88f231 100644 --- a/omega/omega-transaction/pom.xml +++ b/omega/omega-spring-tx/pom.xml @@ -26,8 +26,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>omega-transaction</artifactId> - + <artifactId>omega-spring-tx</artifactId> <dependencies> <dependency> <groupId>org.springframework.boot</groupId> @@ -41,6 +40,10 @@ <groupId>io.servicecomb.saga</groupId> <artifactId>omega-context</artifactId> </dependency> + <dependency> + <groupId>io.servicecomb.saga</groupId> + <artifactId>omega-transaction</artifactId> + </dependency> <dependency> <groupId>junit</groupId> @@ -69,7 +72,6 @@ <scope>test</scope> </dependency> - </dependencies> -</project> \ No newline at end of file +</project> diff --git a/omega/omega-transaction/src/main/java/io/servicecomb/saga/omega/transaction/TransactionAspectConfig.java b/omega/omega-spring-tx/src/main/java/io/servicecomb/saga/omega/transaction/spring/TransactionAspectConfig.java similarity index 83% rename from omega/omega-transaction/src/main/java/io/servicecomb/saga/omega/transaction/TransactionAspectConfig.java rename to omega/omega-spring-tx/src/main/java/io/servicecomb/saga/omega/transaction/spring/TransactionAspectConfig.java index 5a9cd5e..683aa85 100644 --- a/omega/omega-transaction/src/main/java/io/servicecomb/saga/omega/transaction/TransactionAspectConfig.java +++ b/omega/omega-spring-tx/src/main/java/io/servicecomb/saga/omega/transaction/spring/TransactionAspectConfig.java @@ -15,12 +15,16 @@ * limitations under the License. */ -package io.servicecomb.saga.omega.transaction; +package io.servicecomb.saga.omega.transaction.spring; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; +import io.servicecomb.saga.omega.transaction.MessageSender; +import io.servicecomb.saga.omega.transaction.MessageSerializer; +import io.servicecomb.saga.omega.transaction.TransactionAspect; + @Configuration @EnableAspectJAutoProxy class TransactionAspectConfig { diff --git a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionInterceptionTest.java b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java similarity index 90% rename from omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionInterceptionTest.java rename to omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java index 495ed27..04996ff 100644 --- a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionInterceptionTest.java +++ b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionInterceptionTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.saga.omega.transaction; +package io.servicecomb.saga.omega.transaction.spring; import static com.seanyinx.github.unit.scaffolding.Randomness.uniquify; import static org.hamcrest.collection.IsIterableContainingInOrder.contains; @@ -32,7 +32,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.test.context.junit4.SpringRunner; -import io.servicecomb.saga.omega.transaction.TransactionInterceptionTest.MessageConfig; +import io.servicecomb.saga.omega.transaction.MessageSender; +import io.servicecomb.saga.omega.transaction.MessageSerializer; +import io.servicecomb.saga.omega.transaction.spring.TransactionInterceptionTest.MessageConfig; @RunWith(SpringRunner.class) @SpringBootTest(classes = {TransactionTestMain.class, MessageConfig.class}) diff --git a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionTestMain.java b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionTestMain.java similarity index 95% rename from omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionTestMain.java rename to omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionTestMain.java index 1df292c..7632eb3 100644 --- a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionTestMain.java +++ b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionTestMain.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.saga.omega.transaction; +package io.servicecomb.saga.omega.transaction.spring; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionalUserService.java b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java similarity index 95% rename from omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionalUserService.java rename to omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java index d4346a0..1d17c6c 100644 --- a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/TransactionalUserService.java +++ b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/TransactionalUserService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.saga.omega.transaction; +package io.servicecomb.saga.omega.transaction.spring; import javax.transaction.Transactional; diff --git a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/User.java b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/User.java similarity index 88% rename from omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/User.java rename to omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/User.java index f8034a7..a90d1d6 100644 --- a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/User.java +++ b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/User.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.servicecomb.saga.omega.transaction; +package io.servicecomb.saga.omega.transaction.spring; import javax.persistence.Entity; import javax.persistence.GeneratedValue; @@ -30,7 +30,7 @@ public class User { private String username; private String email; - public User(String username, String email) { + User(String username, String email) { this.username = username; this.email = email; } @@ -39,11 +39,11 @@ public class User { return id; } - public String username() { + String username() { return username; } - public String email() { + String email() { return email; } } diff --git a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/UserRepository.java b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/UserRepository.java similarity index 88% rename from omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/UserRepository.java rename to omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/UserRepository.java index 60cf93f..14f9e95 100644 --- a/omega/omega-transaction/src/test/java/io/servicecomb/saga/omega/transaction/UserRepository.java +++ b/omega/omega-spring-tx/src/test/java/io/servicecomb/saga/omega/transaction/spring/UserRepository.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package io.servicecomb.saga.omega.transaction; +package io.servicecomb.saga.omega.transaction.spring; import org.springframework.data.repository.CrudRepository; -public interface UserRepository extends CrudRepository<User, Long> { +interface UserRepository extends CrudRepository<User, Long> { } diff --git a/omega/omega-transaction/pom.xml b/omega/omega-transaction/pom.xml index 1de2909..e14c10c 100644 --- a/omega/omega-transaction/pom.xml +++ b/omega/omega-transaction/pom.xml @@ -30,16 +30,16 @@ <dependencies> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter</artifactId> + <groupId>io.servicecomb.saga</groupId> + <artifactId>omega-context</artifactId> </dependency> <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-data-jpa</artifactId> + <groupId>org.aspectj</groupId> + <artifactId>aspectjweaver</artifactId> </dependency> <dependency> - <groupId>io.servicecomb.saga</groupId> - <artifactId>omega-context</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> </dependency> <dependency> @@ -58,17 +58,6 @@ <groupId>com.github.seanyinx</groupId> <artifactId>unit-scaffolding</artifactId> </dependency> - <dependency> - <groupId>org.springframework.boot</groupId> - <artifactId>spring-boot-starter-test</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - </dependencies> diff --git a/omega/omega-transaction/src/main/java/io/servicecomb/saga/omega/transaction/TransactionAspect.java b/omega/omega-transaction/src/main/java/io/servicecomb/saga/omega/transaction/TransactionAspect.java index 00f283a..54f6d58 100644 --- a/omega/omega-transaction/src/main/java/io/servicecomb/saga/omega/transaction/TransactionAspect.java +++ b/omega/omega-transaction/src/main/java/io/servicecomb/saga/omega/transaction/TransactionAspect.java @@ -28,12 +28,12 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; @Aspect -class TransactionAspect { +public class TransactionAspect { private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass()); private final PreTransactionInterceptor preTransactionInterceptor; - TransactionAspect(MessageSerializer serializer, MessageSender sender) { + public TransactionAspect(MessageSerializer serializer, MessageSender sender) { this.preTransactionInterceptor = new PreTransactionInterceptor(sender, serializer); } diff --git a/omega/pom.xml b/omega/pom.xml index 069f907..10389e4 100644 --- a/omega/pom.xml +++ b/omega/pom.xml @@ -31,6 +31,7 @@ <modules> <module>omega-transaction</module> <module>omega-context</module> + <module>omega-spring-tx</module> </modules> <dependencyManagement> @@ -47,6 +48,11 @@ <artifactId>omega-context</artifactId> <version>0.0.3-SNAPSHOT</version> </dependency> + <dependency> + <groupId>io.servicecomb.saga</groupId> + <artifactId>omega-transaction</artifactId> + <version>0.0.3-SNAPSHOT</version> + </dependency> </dependencies> </dependencyManagement> -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
