Skip to content

Commit

Permalink
reorganized modules.
Browse files Browse the repository at this point in the history
  • Loading branch information
@dartartem
dartartem committed Feb 26, 2020
1 parent eb3b028 commit 9fcc316
Show file tree
Hide file tree
Showing 32 changed files with 37 additions and 38 deletions.
2 changes: 1 addition & 1 deletion eventuate-client-java-jdbc-autoconfigure/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies {
compile project(":eventuate-client-java-jdbc-spring")
compile project(":eventuate-client-java-spring-jdbc")
compile project(":eventuate-client-java-spring-autoconfigure")
}
2 changes: 1 addition & 1 deletion eventuate-client-java-jdbc-autoconfigure/src/main/resources/META-INF/spring.factories
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
io.eventuate.javaclient.jdbc.spring.EventuateJdbcEventStoreConfiguration
io.eventuate.javaclient.spring.jdbc.EventuateJdbcEventStoreConfiguration
2 changes: 1 addition & 1 deletion eventuate-client-java-jdbc-micronaut-tests-common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencyManagement {
}

dependencies {
compile project(":eventuate-client-java-jdbc-micronaut")
compile project(":eventuate-client-java-micronaut-jdbc")

compile "io.micronaut:micronaut-spring"
annotationProcessor "io.micronaut:micronaut-inject-java"
Expand Down
2 changes: 1 addition & 1 deletion ...e-client-java-jdbc-micronaut/build.gradle → ...e-client-java-micronaut-jdbc/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ dependencies {
compile project(":eventuate-client-java-micronaut")
compile project(":eventuate-client-java-jdbc-common-tests")

compile "io.eventuate.common:eventuate-common-jdbc-micronaut-spring:$eventuateCommonVersion"
compile "io.eventuate.common:eventuate-common-micronaut-spring-jdbc:$eventuateCommonVersion"

compile "io.micronaut:micronaut-spring"
annotationProcessor "io.micronaut:micronaut-inject-java"
Expand Down
2 changes: 1 addition & 1 deletion ...ut/EmbeddedTestAggregateStoreFactory.java → ...bc/EmbeddedTestAggregateStoreFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.micronaut;
package io.eventuate.javaclient.micronaut.jdbc;

import io.eventuate.common.jdbc.EventuateCommonJdbcOperations;
import io.eventuate.common.jdbc.EventuateJdbcStatementExecutor;
Expand Down
2 changes: 1 addition & 1 deletion ...vaclient/jdbc/micronaut/package-info.java → ...vaclient/micronaut/jdbc/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
* An embedded JDBC-based version of the event store that can be used for testing
*/
package io.eventuate.javaclient.jdbc.micronaut;
package io.eventuate.javaclient.micronaut.jdbc;
2 changes: 1 addition & 1 deletion ...ntuateEmbeddedTestAggregateStoreTest.java → ...ntuateEmbeddedTestAggregateStoreTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.micronaut;
package io.eventuate.javaclient.micronaut.jdbc;

import io.eventuate.*;
import io.eventuate.common.id.Int128;
Expand Down
2 changes: 1 addition & 1 deletion ...icronaut/EventuateJdbcAccessImplTest.java → ...aut/jdbc/EventuateJdbcAccessImplTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.micronaut;
package io.eventuate.javaclient.micronaut.jdbc;

import io.eventuate.common.jdbc.EventuateJdbcStatementExecutor;
import io.eventuate.javaclient.jdbc.EventuateJdbcAccess;
Expand Down
2 changes: 1 addition & 1 deletion .../jdbc/micronaut/EventuateTestFactory.java → .../micronaut/jdbc/EventuateTestFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.micronaut;
package io.eventuate.javaclient.micronaut.jdbc;

import io.micronaut.context.annotation.Factory;
import org.springframework.jdbc.datasource.DataSourceTransactionManager;
Expand Down
4 changes: 2 additions & 2 deletions ...uate-client-java-jdbc-spring/build.gradle → ...uate-client-java-spring-jdbc/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
apply plugin: PublicModulePlugin

dependencies {
compile "io.eventuate.common:eventuate-common-jdbc-spring:$eventuateCommonVersion"
compile "io.eventuate.common:eventuate-common-spring-jdbc:$eventuateCommonVersion"

compile project(":eventuate-client-java-jdbc")
compile project(":eventuate-client-java-jdbc-common-tests")
compile project(":eventuate-client-java-spring-common")
compile project(":eventuate-client-java-spring")

compile "io.eventuate.common:eventuate-common-in-memory-database-spring:$eventuateCommonVersion"
compile "io.eventuate.common:eventuate-common-spring-in-memory-database:$eventuateCommonVersion"

testCompile project(":eventuate-client-java-test-util")
testCompile "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
Expand Down
6 changes: 3 additions & 3 deletions ...eddedTestAggregateStoreConfiguration.java → ...eddedTestAggregateStoreConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;

import io.eventuate.common.inmemorydatabase.EventuateCommonInMemoryDatabaseConfiguration;
import io.eventuate.common.inmemorydatabase.EventuateDatabaseScriptSupplier;
import io.eventuate.common.jdbc.EventuateCommonJdbcOperations;
import io.eventuate.common.jdbc.EventuateJdbcStatementExecutor;
import io.eventuate.common.jdbc.EventuateTransactionTemplate;
import io.eventuate.common.jdbc.spring.EventuateCommonJdbcOperationsConfiguration;
import io.eventuate.common.spring.inmemorydatabase.EventuateCommonInMemoryDatabaseConfiguration;
import io.eventuate.common.spring.jdbc.EventuateCommonJdbcOperationsConfiguration;
import io.eventuate.javaclient.commonimpl.AggregateCrud;
import io.eventuate.javaclient.commonimpl.AggregateEvents;
import io.eventuate.javaclient.commonimpl.adapters.SyncToAsyncAggregateCrudAdapter;
Expand Down
2 changes: 1 addition & 1 deletion ...EventuateJdbcEventStoreConfiguration.java → ...EventuateJdbcEventStoreConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;

import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
Expand Down
2 changes: 1 addition & 1 deletion .../javaclient/jdbc/spring/package-info.java → .../javaclient/spring/jdbc/package-info.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/**
* An embedded JDBC-based version of the event store that can be used for testing
*/
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;
2 changes: 1 addition & 1 deletion ...ng/CustomEventuateJdbcAccessImplTest.java → ...bc/CustomEventuateJdbcAccessImplTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;

import io.eventuate.common.jdbc.EventuateSchema;
import org.junit.Before;
Expand Down
2 changes: 1 addition & 1 deletion ...g/DefaultEventuateJdbcAccessImplTest.java → ...c/DefaultEventuateJdbcAccessImplTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;

import io.eventuate.common.jdbc.EventuateSchema;
import org.junit.runner.RunWith;
Expand Down
2 changes: 1 addition & 1 deletion ...ing/EmptyEventuateJdbcAccessImplTest.java → ...dbc/EmptyEventuateJdbcAccessImplTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;

import io.eventuate.common.jdbc.EventuateSchema;
import org.junit.Before;
Expand Down
2 changes: 1 addition & 1 deletion ...ntuateEmbeddedTestAggregateStoreTest.java → ...ntuateEmbeddedTestAggregateStoreTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;

import io.eventuate.*;
import io.eventuate.common.id.Int128;
Expand Down
6 changes: 3 additions & 3 deletions ...c/spring/EventuateJdbcAccessImplTest.java → ...ing/jdbc/EventuateJdbcAccessImplTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.eventuate.javaclient.jdbc.spring;
package io.eventuate.javaclient.spring.jdbc;

import io.eventuate.common.common.spring.jdbc.EventuateSpringJdbcStatementExecutor;
import io.eventuate.common.common.spring.jdbc.EventuateSpringTransactionTemplate;
import io.eventuate.common.jdbc.*;
import io.eventuate.common.jdbc.spring.common.EventuateSpringJdbcStatementExecutor;
import io.eventuate.common.jdbc.spring.common.EventuateSpringTransactionTemplate;
import io.eventuate.javaclient.jdbc.EventuateJdbcAccess;
import io.eventuate.javaclient.jdbc.EventuateJdbcAccessImpl;
import io.eventuate.javaclient.jdbc.common.tests.CommonEventuateJdbcAccessImplTest;
Expand Down
1 change: 0 additions & 1 deletion eventuate-client-java-spring-test-util/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@ apply plugin: PublicModulePlugin
dependencies {
compile project(":eventuate-client-java-test-util")
compile project(":eventuate-client-java-spring")

}
2 changes: 1 addition & 1 deletion ...ronautAccountIntegrationReactiveTest.java → ...ronautAccountIntegrationReactiveTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.tests.common.micronaut;
package io.eventuate.javaclient.micronaut.tests.common;

import io.eventuate.*;

Expand Down
2 changes: 1 addition & 1 deletion ...tMicronautAccountIntegrationSyncTest.java → ...tMicronautAccountIntegrationSyncTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.tests.common.micronaut;
package io.eventuate.javaclient.micronaut.tests.common;

import io.eventuate.*;
import io.eventuate.sync.EventuateAggregateStore;
Expand Down
2 changes: 1 addition & 1 deletion ...tractMicronautAccountIntegrationTest.java → ...tractMicronautAccountIntegrationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.tests.common.micronaut;
package io.eventuate.javaclient.micronaut.tests.common;

import io.eventuate.EntityNotFoundException;
import io.eventuate.example.banking.services.AccountCommandSideEventHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...SpringAccountIntegrationReactiveTest.java → ...SpringAccountIntegrationReactiveTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.tests.common.spring;
package io.eventuate.javaclient.spring.tests.common;

import io.eventuate.Aggregate;
import io.eventuate.EntityIdAndVersion;
Expand Down
2 changes: 1 addition & 1 deletion ...ractSpringAccountIntegrationSyncTest.java → ...ractSpringAccountIntegrationSyncTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.tests.common.spring;
package io.eventuate.javaclient.spring.tests.common;

import io.eventuate.Aggregate;
import io.eventuate.EntityIdAndVersion;
Expand Down
2 changes: 1 addition & 1 deletion ...AbstractSpringAccountIntegrationTest.java → ...AbstractSpringAccountIntegrationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.javaclient.tests.common.spring;
package io.eventuate.javaclient.spring.tests.common;

import io.eventuate.EntityNotFoundException;
import io.eventuate.example.banking.services.AccountCommandSideEventHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...aut/JavaIntegrationTestDomainFactory.java → ...ces/JavaIntegrationTestDomainFactory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.example.banking.services.micronaut;
package io.eventuate.example.banking.micronaut.services;

import io.eventuate.AggregateRepository;
import io.eventuate.EventuateAggregateStore;
Expand Down
2 changes: 1 addition & 1 deletion ...vaIntegrationTestDomainConfiguration.java → ...vaIntegrationTestDomainConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.eventuate.example.banking.services.spring;
package io.eventuate.example.banking.spring.services;

import io.eventuate.AggregateRepository;
import io.eventuate.EventuateAggregateStore;
Expand Down
2 changes: 1 addition & 1 deletion .../src/test/java/io/eventuate/javaclient/jdbc/JdbcAutoConfigurationIntegrationSyncTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.eventuate.javaclient.jdbc;

import io.eventuate.example.banking.services.counting.InvocationCounter;
import io.eventuate.javaclient.tests.common.spring.AbstractSpringAccountIntegrationSyncTest;
import io.eventuate.javaclient.spring.tests.common.AbstractSpringAccountIntegrationSyncTest;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.IntegrationTest;
Expand Down
2 changes: 1 addition & 1 deletion ...jdbc/src/test/java/io/eventuate/javaclient/jdbc/JdbcAutoConfigurationIntegrationTest.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.eventuate.javaclient.jdbc;

import io.eventuate.javaclient.tests.common.spring.AbstractSpringAccountIntegrationReactiveTest;
import io.eventuate.javaclient.spring.tests.common.AbstractSpringAccountIntegrationReactiveTest;
import org.junit.runner.RunWith;
import org.springframework.boot.test.IntegrationTest;
import org.springframework.boot.test.SpringApplicationConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion .../java/io/eventuate/javaclient/jdbc/JdbcAutoConfigurationIntegrationTestConfiguration.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package io.eventuate.javaclient.jdbc;

import io.eventuate.example.banking.services.spring.JavaIntegrationTestDomainConfiguration;
import io.eventuate.example.banking.spring.services.JavaIntegrationTestDomainConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ eventuateMavenRepoUrl=file:///Users/cer/.m2/testdeploy,https://dl.bintray.com/ev
springBootVersion=1.4.7.RELEASE

rxJavaVersion=1.1.5
eventuateCommonVersion=0.9.0.RC2
eventuateCommonVersion=0.8.3-SNAPSHOT

version=0.22.0-SNAPSHOT
4 changes: 2 additions & 2 deletions settings.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ include 'eventuate-client-java-http-stomp-spring-autoconfigure'

include 'eventuate-client-java-jdbc-common'
include 'eventuate-client-java-jdbc'
include 'eventuate-client-java-jdbc-spring'
include 'eventuate-client-java-jdbc-micronaut'
include 'eventuate-client-java-spring-jdbc'
include 'eventuate-client-java-micronaut-jdbc'
include 'eventuate-client-java-jdbc-common-tests'
include 'eventuate-client-java-jdbc-autoconfigure'

Expand Down

0 comments on commit 9fcc316

Please sign in to comment.