[fineract-cn-demo-server] branch develop updated: Eliminate traces of MariaDB
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git The following commit(s) were added to refs/heads/develop by this push: new 39dd0b1 Eliminate traces of MariaDB new 1058438 Merge pull request #34 from Izakey/develop 39dd0b1 is described below commit 39dd0b1a19708aca3f2f2b8127d272c6f8f1ce65 Author: Isaac Kamga AuthorDate: Sun Oct 20 01:16:19 2019 +0100 Eliminate traces of MariaDB --- README.md | 12 ++-- scripts/Unix/initial-setup.sh | 2 +- scripts/Unix/pull-all.sh | 4 ++-- scripts/windows/initial-setup.bat | 8 scripts/windows/pull-all.bat | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 99c4311..3aed834 100644 --- a/README.md +++ b/README.md @@ -37,11 +37,11 @@ cassandra user to use # cassandra.cluster.pwd cassandra password to use -# custom.mariadb.host -mariadb host to use +# custom.postgresql.host +postgresql host to use -# custom.mariadb.user -mariadb user to use +# custom.postgresql.user +postgresql user to use -# custom.mariadb.password -mariadb password to use +# custom.postgresql.password +postgresql password to use diff --git a/scripts/Unix/initial-setup.sh b/scripts/Unix/initial-setup.sh index c9061ec..88d41e0 100755 --- a/scripts/Unix/initial-setup.sh +++ b/scripts/Unix/initial-setup.sh @@ -38,7 +38,7 @@ get_modules() { done } -get_modules fineract-cn-lang fineract-cn-api fineract-cn-async fineract-cn-cassandra fineract-cn-mariadb fineract-cn-data-jpa fineract-cn-command fineract-cn-test fineract-cn-postgresql +get_modules fineract-cn-lang fineract-cn-api fineract-cn-async fineract-cn-cassandra fineract-cn-postgresql fineract-cn-data-jpa fineract-cn-command fineract-cn-test # Return to start folder cd .. diff --git a/scripts/Unix/pull-all.sh b/scripts/Unix/pull-all.sh index 1c59f11..b330e8d 100644 --- a/scripts/Unix/pull-all.sh +++ b/scripts/Unix/pull-all.sh @@ -35,8 +35,8 @@ get_modules() { ( cd core -get_modules fineract-cn-lang fineract-cn-api fineract-cn-async fineract-cn-cassandra fineract-cn-mariadb fineract-cn-data-jpa \ -fineract-cn-command fineract-cn-test fineract-cn-postgresql +get_modules fineract-cn-lang fineract-cn-api fineract-cn-async fineract-cn-cassandra fineract-cn-postgresql fineract-cn-data-jpa \ +fineract-cn-command fineract-cn-test ) ( diff --git a/scripts/windows/initial-setup.bat b/scripts/windows/initial-setup.bat index c9db5ab..17a26fa 100644 --- a/scripts/windows/initial-setup.bat +++ b/scripts/windows/initial-setup.bat @@ -50,10 +50,10 @@ CALL gradlew publishToMavenLocal TIMEOUT /T 5 cd .. -REM initialize mariadb -git clone https://github.com/%githubAccount%/fineract-cn-mariadb.git -cd fineract-cn-mariadb -git remote add upstream https://github.com/apache/fineract-cn-mariadb.git +REM initialize postgresql +git clone https://github.com/%githubAccount%/fineract-cn-postgresql.git +cd fineract-cn-postgresql +git remote add upstream https://github.com/apache/fineract-cn-postgresql.git git checkout develop CALL gradlew publishToMavenLocal TIMEOUT /T 5 diff --git a/scripts/windows/pull-all.bat b/scripts/windows/pull-all.bat index ecdfb57..357b83b 100644 --- a/scripts/windows/pull-all.bat +++ b/scripts/windows/pull-all.bat @@ -48,8 +48,8 @@ git push origin develop TIMEOUT /T 5 cd .. -REM pull mariadb -cd fineract-cn-mariadb +REM pull postgresql +cd fineract-cn-postgresql git checkout develop git pull upstream develop CALL gradlew publishToMavenLocal
[fineract-cn-permitted-feign-client] branch develop updated: Eliminate traces of MariaDB
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-permitted-feign-client.git The following commit(s) were added to refs/heads/develop by this push: new 406e0f8 Eliminate traces of MariaDB new 1883b06 Merge pull request #10 from Izakey/develop 406e0f8 is described below commit 406e0f8f58a90676ced6ff798070a4cfe2074a9b Author: Isaac Kamga AuthorDate: Sun Oct 20 00:55:12 2019 +0100 Eliminate traces of MariaDB --- shared.gradle | 5 - 1 file changed, 5 deletions(-) diff --git a/shared.gradle b/shared.gradle index 540355c..1068642 100644 --- a/shared.gradle +++ b/shared.gradle @@ -42,11 +42,6 @@ repositories { maven { url 'https://mifos.jfrog.io/mifos/libs-snapshot/' } } -configurations { -compile.exclude group: 'org.apache.fineract.cn', module: 'mariadb' -compile.exclude group: 'ch.vorburger', module: 'mariaDB4j' -} - dependencyManagement { imports { mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
[fineract-cn-provisioner] branch develop updated: Eliminate traces of MariaDB
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-provisioner.git The following commit(s) were added to refs/heads/develop by this push: new 785f08d Eliminate traces of MariaDB new 01bd419 Merge pull request #14 from Izakey/develop 785f08d is described below commit 785f08d1c636c1fdfb8799292e309ae2337058d9 Author: Isaac Kamga AuthorDate: Sun Oct 20 01:02:59 2019 +0100 Eliminate traces of MariaDB --- .../java/org/apache/fineract/cn/provisioner/tenant/Fixture.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/Fixture.java b/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/Fixture.java index 623282c..087387f 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/Fixture.java +++ b/component-test/src/main/java/org/apache/fineract/cn/provisioner/tenant/Fixture.java @@ -20,6 +20,7 @@ package org.apache.fineract.cn.provisioner.tenant; import org.apache.commons.lang.RandomStringUtils; +import org.apache.fineract.cn.postgresql.util.PostgreSQLConstants; import org.apache.fineract.cn.provisioner.api.v1.domain.CassandraConnectionInfo; import org.apache.fineract.cn.provisioner.api.v1.domain.DatabaseConnectionInfo; import org.apache.fineract.cn.provisioner.api.v1.domain.Tenant; @@ -42,12 +43,12 @@ class Fixture { final DatabaseConnectionInfo databaseConnectionInfo = new DatabaseConnectionInfo(); compTestTenant.setDatabaseConnectionInfo(databaseConnectionInfo); -databaseConnectionInfo.setDriverClass("org.mariadb.jdbc.Driver"); +databaseConnectionInfo.setDriverClass("org.postgresql.Driver"); databaseConnectionInfo.setDatabaseName(compTestTenant.getIdentifier()); databaseConnectionInfo.setHost("localhost"); -databaseConnectionInfo.setPort("3306"); -databaseConnectionInfo.setUser("root"); -databaseConnectionInfo.setPassword("mysql"); +databaseConnectionInfo.setPort("5432"); +databaseConnectionInfo.setUser("postgres"); +databaseConnectionInfo.setPassword("postgres"); return compTestTenant; }
[fineract-cn-identity] branch develop updated: Eliminate traces of MariaDB
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-identity.git The following commit(s) were added to refs/heads/develop by this push: new f988da1 Eliminate traces of MariaDB new d810987 Merge pull request #18 from Izakey/develop f988da1 is described below commit f988da1c8a575ab6d65c91b5137ee6b6b37f32b4 Author: Isaac Kamga AuthorDate: Sun Oct 20 00:48:32 2019 +0100 Eliminate traces of MariaDB --- shared.gradle | 5 - 1 file changed, 5 deletions(-) diff --git a/shared.gradle b/shared.gradle index 6423092..afe9ed2 100644 --- a/shared.gradle +++ b/shared.gradle @@ -42,11 +42,6 @@ repositories { maven { url 'https://mifos.jfrog.io/mifos/libs-snapshot/' } } -configurations { -compile.exclude group: 'org.apache.fineract.cn', module: 'mariadb' -compile.exclude group: 'ch.vorburger', module: 'mariaDB4j' -} - dependencyManagement { imports { mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
[fineract-cn-anubis] branch develop updated: Eliminate traces of MariaDB
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-anubis.git The following commit(s) were added to refs/heads/develop by this push: new 57116eb Eliminate traces of MariaDB new b914cbc Merge pull request #10 from Izakey/develop 57116eb is described below commit 57116ebf69dd43b94599bc39cae950cc7dc4b97e Author: Isaac Kamga AuthorDate: Sun Oct 20 00:43:55 2019 +0100 Eliminate traces of MariaDB --- shared.gradle | 5 - 1 file changed, 5 deletions(-) diff --git a/shared.gradle b/shared.gradle index 4f6992c..492704f 100644 --- a/shared.gradle +++ b/shared.gradle @@ -44,11 +44,6 @@ repositories { maven { url 'https://mifos.jfrog.io/mifos/libs-snapshot/' } } -configurations { -compile.exclude group: 'org.apache.fineract.cn', module: 'mariadb' -compile.exclude group: 'ch.vorburger', module: 'mariaDB4j' -} - dependencyManagement { imports { mavenBom 'io.spring.platform:platform-bom:Athens-RELEASE'
[fineract-cn-data-jpa] branch develop updated: Eliminate traces of MariaDB
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-data-jpa.git The following commit(s) were added to refs/heads/develop by this push: new 42ee82e Eliminate traces of MariaDB new ffb1cf2 Merge pull request #9 from Izakey/develop 42ee82e is described below commit 42ee82e4bb2cb4380c1a8893e82f85e3a541e4cc Author: Isaac Kamga AuthorDate: Sat Oct 19 23:59:45 2019 +0100 Eliminate traces of MariaDB --- README.md | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bdf96da..cf93288 100644 --- a/README.md +++ b/README.md @@ -10,13 +10,12 @@ Apache Fineract CN is an application framework for digital financial services, a Install Java 8 as described at https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html. ### Installation - MariaDB -Install MariaDB as described at https://mariadb.com/kb/en/mariadb/binary-packages/. + PostgreSQL +Install PostgreSQL as described at https://www.digitalocean.com/community/tutorials/how-to-install-and-use-postgresql-on-ubuntu-16-04 -After installation you need to create the meta database: +After installation you need to connect to the default postgres database: -mysql -u root -pmysql -CREATE DATABASE IF NOT EXISTS system_console; +sudo -i -u postgres psql ## Multi-tenancy Multi-tenancy is reached by providing separate data storage on a per tenant basis.
[fineract-cn-rhythm] branch develop updated (7f1556f -> 9f10895)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-rhythm.git. from 7f1556f Merge pull request #13 from aasaru/gradle_4.10.3 new 033fe48 FINCN-177 catch actual exception and detect problem new d95d246 https://stackoverflow.com/questions/6371638/slf4j-how-to-log-formatted-message-object-array-exception new 18db889 FINCN-177 catch the most concrete exception new 346a349 fix formatting new 9f10895 Merge pull request #15 from aasaru/FINCN-177 The 107 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../internal/service/BeatPublisherService.java | 5 ++-- .../rhythm/service/internal/service/Drummer.java | 31 +- 2 files changed, 21 insertions(+), 15 deletions(-)
[fineract-cn-notifications] branch develop updated: Migrating MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git The following commit(s) were added to refs/heads/develop by this push: new fb20e5d Migrating MariaDB to PostgreSQL new 7677e86 Merge pull request #17 from ebenezergraham/FINCN-127 fb20e5d is described below commit fb20e5d066565cb29bff644113f59d4e46449c38 Author: Ebenezer Graham AuthorDate: Wed Sep 4 02:44:34 2019 +0400 Migrating MariaDB to PostgreSQL --- .../cn/notification/AbstractNotificationTest.java | 4 +- .../cn/notification/SuiteTestEnvironment.java | 8 +- .../fineract/cn/notification/TestSMSService.java | 2 +- .../apache/fineract/cn/notification/TestSuite.java | 4 +- .../{TestTemplateImport.java => TestImport.java} | 27 +++- .../resources/importdata/test-email-config.csv | 2 + .../main/resources/importdata/test-sms-config.csv | 2 + service/build.gradle | 2 +- .../command/handler/MigrationCommandHandler.java | 2 +- .../internal/config/NotificationConfiguration.java | 4 +- .../service/internal/importer/Importer.java| 177 + .../internal/importer/TemplateImporter.java| 92 --- .../internal/service/NotificationService.java | 5 + .../service/internal/service/SMSService.java | 12 +- .../NotificationAuthentication.java| 59 +++ .../service/listener/CustomerEventListener.java| 51 ++ service/src/main/resources/application.yml | 16 +- .../db/migrations/mariadb/V1__initial_setup.sql| 76 - .../db/migrations/postgresql/V1__initial_setup.sql | 58 +++ shared.gradle | 5 +- 20 files changed, 370 insertions(+), 238 deletions(-) diff --git a/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java b/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java index 4f0dbc1..01ed4b4 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/notification/AbstractNotificationTest.java @@ -50,11 +50,11 @@ import java.security.interfaces.RSAPrivateKey; public class AbstractNotificationTest extends SuiteTestEnvironment { @ClassRule - public final static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, mariaDBInitializer); + public final static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, postgreSQLInitializer); public static final String LOGGER_NAME = "test-logger"; public static final String TEST_USER = "homer"; public static final String TEST_ADDRESS = "egraha...@alustudent.com"; // Replace with developer's dummy testing email - public static final String TEST_TEMPLATE= "sample"; + public static final String TEST_TEMPLATE= "test_sample"; public static final String SMS_TEST_NUMBER= "+23058409206"; // Replace with developers dummy testing number @SuppressWarnings("WeakerAccess") diff --git a/component-test/src/main/java/org/apache/fineract/cn/notification/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/notification/SuiteTestEnvironment.java index 46ca216..cd1eee4 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/notification/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/notification/SuiteTestEnvironment.java @@ -21,7 +21,7 @@ package org.apache.fineract.cn.notification; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.RunExternalResourceOnce; @@ -39,12 +39,12 @@ public class SuiteTestEnvironment { static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); - static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); - final static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, mariaDBInitializer); + static final PostgreSQLInitializer p
[fineract-cn-deposit-account-management] branch develop updated: Migrate deposit service from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-deposit-account-management.git The following commit(s) were added to refs/heads/develop by this push: new 6ceccb7 Migrate deposit service from MariaDB to PostgreSQL new 69685b1 Merge pull request #11 from Izakey/FINCN-122 6ceccb7 is described below commit 6ceccb7aeb4ceada1f0de1a4cf9908316777e27a Author: Isaac Kamga AuthorDate: Thu May 9 03:27:25 2019 +0100 Migrate deposit service from MariaDB to PostgreSQL --- NOTICE.txt | 2 +- .../AbstractDepositAccountManagementTest.java | 2 +- .../fineract/cn/deposit/SuiteTestEnvironment.java | 6 +- service/build.gradle | 3 +- .../DepositAccountManagementConfiguration.java | 4 +- .../command/handler/MigrationAggregate.java| 2 +- .../repository/DividendDistributionEntity.java | 2 +- .../repository/ProductDefinitionCommandEntity.java | 2 +- .../repository/ProductDefinitionEntity.java| 2 +- .../internal/repository/ProductInstanceEntity.java | 4 +- service/src/main/resources/application.yml | 15 +++-- .../{mariadb => postgresql}/V1__initial_setup.sql | 74 -- .../V2__modify_product_instances.sql | 2 +- .../{mariadb => postgresql}/V3__term_nullable.sql | 4 +- .../V4__add_unique_constraint_charges.sql | 0 .../V5__interest_calculation.sql | 16 ++--- ..._add_opened_on_last_transaction_to_instance.sql | 2 +- shared.gradle | 3 +- 18 files changed, 64 insertions(+), 81 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 69c4995..e6f96b3 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Fineract CN Deposit-Account-Management -Copyright [2017-2018] The Apache Software Foundation +Copyright [2017-2019] The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java b/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java index 5da6c56..5076d2d 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/deposit/AbstractDepositAccountManagementTest.java @@ -58,7 +58,7 @@ public abstract class AbstractDepositAccountManagementTest extends SuiteTestEnvi public static final String TEST_LOGGER = "test-logger"; @ClassRule - public final static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, mariaDBInitializer); + public final static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, postgreSQLInitializer); @Rule public final TenantApplicationSecurityEnvironmentTestRule tenantApplicationSecurityEnvironment diff --git a/component-test/src/main/java/org/apache/fineract/cn/deposit/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/deposit/SuiteTestEnvironment.java index c8a0716..ba09946 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/deposit/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/deposit/SuiteTestEnvironment.java @@ -21,7 +21,7 @@ package org.apache.fineract.cn.deposit; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.RunExternalResourceOnce; @@ -34,11 +34,11 @@ public class SuiteTestEnvironment { static final String APP_NAME = "deposit-v1"; static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); - static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); + static final PostgreSQLInitializer postgreSQLInitializer = new PostgreSQLInitializer(); @ClassRule public static TestRule orderClassRules = RuleChain .outerRule(new RunExternalResourceOnce(testEnvironment)) .around(new RunExternalResourceOnce(cassandraInitializer)) - .around(new RunExternalResourceOnce(mariaDBInitializer)); + .around(new RunExternalResourceOnce(postgreSQLInitializer)); } diff --git a/service/build.gradle b/service/
[fineract-cn-template] 29/38: Migrate template service from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit db65864ae5e57d0c97c721e66ecb8447687677cb Author: Isaac Kamga AuthorDate: Sat Mar 23 00:06:19 2019 +0100 Migrate template service from MariaDB to PostgreSQL --- .../java/org/apache/fineract/cn/template/SuiteTestEnvironment.java | 6 +++--- .../src/main/java/org/apache/fineract/cn/template/TestSample.java | 2 +- service/src/main/resources/application.yml | 6 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/component-test/src/main/java/org/apache/fineract/cn/template/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/template/SuiteTestEnvironment.java index 85b601e..8d93733 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/template/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/template/SuiteTestEnvironment.java @@ -20,7 +20,7 @@ package org.apache.fineract.cn.template; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.RunExternalResourceOnce; @@ -38,11 +38,11 @@ public class SuiteTestEnvironment { static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); - static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); + static final PostgreSQLInitializer postgreSQLInitializer = new PostgreSQLInitializer(); @ClassRule public static TestRule orderClassRules = RuleChain .outerRule(new RunExternalResourceOnce(testEnvironment)) .around(new RunExternalResourceOnce(cassandraInitializer)) - .around(new RunExternalResourceOnce(mariaDBInitializer)); + .around(new RunExternalResourceOnce(postgreSQLInitializer)); } diff --git a/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java b/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java index 42fc067..10fdd37 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java +++ b/component-test/src/main/java/org/apache/fineract/cn/template/TestSample.java @@ -74,7 +74,7 @@ public class TestSample extends SuiteTestEnvironment { } @ClassRule - public final static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, mariaDBInitializer); + public final static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, postgreSQLInitializer); @Rule public final TenantApplicationSecurityEnvironmentTestRule tenantApplicationSecurityEnvironment diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index 2ae6bd0..b987018 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -23,6 +23,12 @@ spring: enabled: false config: enabled: false + datasource: +driver-class-name: org.postgresql.Driver +platform: postgres +url: jdbc:postgresql://localhost:5432/seshat +username: postgres +password: postgres eureka: client:
[fineract-cn-template] 33/38: Ensure flyway migrations target right database
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit c83f004fddf94348ceb76c6d9e3f086cd7c9703f Author: Isaac Kamga AuthorDate: Thu May 9 02:25:15 2019 +0100 Ensure flyway migrations target right database --- service/src/main/resources/application.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index 6123bd6..6bdce44 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -25,7 +25,7 @@ spring: enabled: false datasource: driver-class-name: org.postgresql.Driver -url: jdbc:postgresql://localhost:5432/seshat +url: jdbc:postgresql://localhost:5432/playground username: postgres password: postgres
[fineract-cn-template] 34/38: Adding rat report to After Failure procedure
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit bccb1acf37736318790f89cde733eebb75877833 Author: ebenezergraham AuthorDate: Wed May 29 19:17:16 2019 +0400 Adding rat report to After Failure procedure --- .travis.yml | 3 +++ shared.gradle | 1 + 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2a53f56..1f94a2c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,3 +28,6 @@ env: - ARTIFACTORY_URL=https://mifos.jfrog.io/mifos - ARTIFACTORY_USER=travis-ci - secure: "WO+UUvMOFTGl93jGbGPLj60fJq8+Gqei9Jx4j9t2OAuz1fTgVwa11VL4Zf51lgbXmy3YoxIn+hoXOdEDTfmMyGW5Y0cG5YbqUve/WII1nJJo5dc7hPf3z4HmsxHYfTRedk4ZnhFH8FDrjPzls4K+VVJuF7X92aUfZbVSuL97gbNXjvhftdWbko6xn+ZLw4HZwQfGDpCRwbqEq7WH2e900lL49QnBM7majONr/nf6mVuyomZvDJaRTDPLh9VXlwJ6hQ1WsajYbH6dCd3CgbAceKb9R7nF0dxMpxPVu3piz9zL9NXXNWqwIifJeJX5U9HT6i7ze5JnzUbBCD9iV0jGj1HGoYTKqKd78Z1K8uOdZxykAspA2Doz2ABQHctPJLNlkkWqagyrMNJmRlJMGVluOpStOIyw7d5GMelmzl16nZfdO0uz+zL56oJtke+G+Ur+ZEiZiHOLweM1/rO/60QxG31qZWsRH [...] +after_failure: + - ./gradlew rat + - cat api/build/reports/rat/rat-report.txt diff --git a/shared.gradle b/shared.gradle index 372caf0..785574e 100644 --- a/shared.gradle +++ b/shared.gradle @@ -113,5 +113,6 @@ rat { "gradlew.bat", "README.md" ] +plainOutput = true }
[fineract-cn-template] 17/38: Updated copyright information on template
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit d57f5e32720b4feb78dbdfd286eca704fdaf26ab Author: Isaac Kamga AuthorDate: Fri Mar 2 22:27:23 2018 +0100 Updated copyright information on template --- HEADER | 25 -- NOTICE.txt | 5 + README.md | 6 +++--- .../mifos/template/api/v1/PermittableGroupIds.java | 25 -- .../api/v1/client/IamATeapotException.java | 25 -- .../template/api/v1/client/TemplateManager.java| 25 -- .../io/mifos/template/api/v1/domain/Sample.java| 25 -- .../template/api/v1/events/EventConstants.java | 25 -- .../mifos/template/api/v1/domain/SampleTest.java | 25 -- .../io/mifos/template/SuiteTestEnvironment.java| 25 -- .../main/java/io/mifos/template/TestSample.java| 25 -- .../src/main/java/io/mifos/template/TestSuite.java | 25 -- .../template/listener/MigrationEventListener.java | 25 -- .../template/listener/SampleEventListener.java | 25 -- .../mifos/template/service/ServiceConstants.java | 25 -- .../template/service/TemplateApplication.java | 25 -- .../template/service/TemplateConfiguration.java| 25 -- .../internal/command/InitializeServiceCommand.java | 25 -- .../service/internal/command/SampleCommand.java| 25 -- .../command/handler/MigrationAggregate.java| 25 -- .../internal/command/handler/SampleAggregate.java | 25 -- .../service/internal/mapper/SampleMapper.java | 25 -- .../internal/repository/SampleJpaEntity.java | 25 -- .../repository/SampleJpaEntityRepository.java | 25 -- .../service/internal/service/SampleService.java| 25 -- .../service/rest/SampleRestController.java | 25 -- service/src/main/resources/application.yml | 25 -- service/src/main/resources/bootstrap.yml | 25 -- .../db/migrations/mariadb/V1__initial_setup.sql| 25 -- shared.gradle | 2 +- 30 files changed, 387 insertions(+), 301 deletions(-) diff --git a/HEADER b/HEADER index 4b2eadf..90705e0 100644 --- a/HEADER +++ b/HEADER @@ -1,13 +1,16 @@ -Copyright ${year} ${name}. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. \ No newline at end of file diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 000..103e2dc --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,5 @@ +Apache Fineract CN Template +Copyright [2017-2018] The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/README.md b/README.md index 1839633..c5ad0cd 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,17 @@ -# Mifos I/O Template +# Apache Fineract CN Template [![Join the chat at https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge_medium=badge_campaign=pr-badge
[fineract-cn-template] 25/38: Change package names from mifos to apache fineract.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit a31d2fdf7c930dccaea2a5d6615a44ce3c5a4849 Author: Myrle Krantz AuthorDate: Fri Apr 13 16:58:38 2018 +0200 Change package names from mifos to apache fineract. --- README.md | 2 +- .../fineract/cn}/template/api/v1/PermittableGroupIds.java | 2 +- .../cn}/template/api/v1/client/IamATeapotException.java| 2 +- .../cn}/template/api/v1/client/TemplateManager.java| 4 ++-- .../apache/fineract/cn}/template/api/v1/domain/Sample.java | 2 +- .../cn}/template/api/v1/events/EventConstants.java | 2 +- .../fineract/cn}/template/api/v1/domain/SampleTest.java| 2 +- .../apache/fineract/cn}/template/SuiteTestEnvironment.java | 2 +- .../apache/fineract/cn}/template/TestSample.java | 14 +++--- .../apache/fineract/cn}/template/TestSuite.java| 2 +- .../cn}/template/listener/MigrationEventListener.java | 4 ++-- .../cn}/template/listener/SampleEventListener.java | 4 ++-- .../fineract/cn}/template/service/ServiceConstants.java| 2 +- .../fineract/cn}/template/service/TemplateApplication.java | 2 +- .../cn}/template/service/TemplateConfiguration.java| 12 ++-- .../service/internal/command/InitializeServiceCommand.java | 2 +- .../template/service/internal/command/SampleCommand.java | 4 ++-- .../internal/command/handler/MigrationAggregate.java | 8 .../service/internal/command/handler/SampleAggregate.java | 10 +- .../cn}/template/service/internal/mapper/SampleMapper.java | 6 +++--- .../service/internal/repository/SampleJpaEntity.java | 2 +- .../internal/repository/SampleJpaEntityRepository.java | 2 +- .../template/service/internal/service/SampleService.java | 8 .../cn}/template/service/rest/SampleRestController.java| 14 +++--- 24 files changed, 57 insertions(+), 57 deletions(-) diff --git a/README.md b/README.md index 3f20df9..0a1f496 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Apache Fineract CN is an application framework for digital financial services, a 7. Import project into IDE -8. Rename all io.mifos.template packages to io.mifos.{project name} +8. Rename all org.apache.fineract.cn.template packages to io.mifos.{project name} 9. Open _SampleRestConfiguration_ and _SampleServiceConfiguration_, adjust @ComponentScan to reflect the new package name diff --git a/api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java b/api/src/main/java/org/apache/fineract/cn/template/api/v1/PermittableGroupIds.java similarity index 95% rename from api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java rename to api/src/main/java/org/apache/fineract/cn/template/api/v1/PermittableGroupIds.java index ef5ec01..5b7a4a9 100644 --- a/api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java +++ b/api/src/main/java/org/apache/fineract/cn/template/api/v1/PermittableGroupIds.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.template.api.v1; +package org.apache.fineract.cn.template.api.v1; @SuppressWarnings("unused") public interface PermittableGroupIds { diff --git a/api/src/main/java/io/mifos/template/api/v1/client/IamATeapotException.java b/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/IamATeapotException.java similarity index 94% rename from api/src/main/java/io/mifos/template/api/v1/client/IamATeapotException.java rename to api/src/main/java/org/apache/fineract/cn/template/api/v1/client/IamATeapotException.java index 00825b2..df11da2 100644 --- a/api/src/main/java/io/mifos/template/api/v1/client/IamATeapotException.java +++ b/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/IamATeapotException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.template.api.v1.client; +package org.apache.fineract.cn.template.api.v1.client; @SuppressWarnings("WeakerAccess") public class IamATeapotException extends RuntimeException { diff --git a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java b/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/TemplateManager.java similarity index 95% rename from api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java rename to api/src/main/java/org/apache/fineract/cn/template/api/v1/client/TemplateManager.java index f4d7037..9caf8dc 100644 --- a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java +++ b/api/src/main/java/org/apache/fineract/cn/template/api/v1/client/TemplateManager.java @@ -16,9 +16,9 @@ * specific language governing permiss
[fineract-cn-template] 28/38: Migrate template service from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 4e85c4e699261f09aee37440f020ba7d024f7a5f Author: Isaac Kamga AuthorDate: Tue Mar 19 06:00:58 2019 +0100 Migrate template service from MariaDB to PostgreSQL --- NOTICE.txt | 2 +- service/build.gradle | 2 +- .../fineract/cn/template/service/TemplateConfiguration.java| 4 ++-- .../service/internal/command/handler/MigrationAggregate.java | 2 +- service/src/main/resources/application.yml | 10 +- .../migrations/{mariadb => postgresql}/V1__initial_setup.sql | 0 shared.gradle | 5 +++-- 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 103e2dc..9632ed9 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Fineract CN Template -Copyright [2017-2018] The Apache Software Foundation +Copyright [2017-2019] The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/service/build.gradle b/service/build.gradle index 23acde2..7dd4a75 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -54,7 +54,7 @@ dependencies { [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], [group: 'org.apache.fineract.cn', name: 'async', version: versions.frameworkasync], [group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra], -[group: 'org.apache.fineract.cn', name: 'mariadb', version: versions.frameworkmariadb], +[group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql], [group: 'org.apache.fineract.cn', name: 'command', version: versions.frameworkcommand], [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator] ) diff --git a/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java b/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java index 568ae47..0f1a8b2 100644 --- a/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/template/service/TemplateConfiguration.java @@ -24,7 +24,7 @@ import org.apache.fineract.cn.cassandra.config.EnableCassandra; import org.apache.fineract.cn.command.config.EnableCommandProcessing; import org.apache.fineract.cn.lang.config.EnableServiceException; import org.apache.fineract.cn.lang.config.EnableTenantContext; -import org.apache.fineract.cn.mariadb.config.EnableMariaDB; +import org.apache.fineract.cn.postgresql.config.EnablePostgreSQL; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; @@ -43,7 +43,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter @EnableAsync @EnableTenantContext @EnableCassandra -@EnableMariaDB +@EnablePostgreSQL @EnableCommandProcessing @EnableAnubis @EnableServiceException diff --git a/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java index ef44e6c..a5d9876 100644 --- a/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/org/apache/fineract/cn/template/service/internal/command/handler/MigrationAggregate.java @@ -27,7 +27,7 @@ import org.apache.fineract.cn.command.annotation.CommandHandler; import org.apache.fineract.cn.command.annotation.CommandLogLevel; import org.apache.fineract.cn.command.annotation.EventEmitter; import org.apache.fineract.cn.lang.ApplicationName; -import org.apache.fineract.cn.mariadb.domain.FlywayFactoryBean; +import org.apache.fineract.cn.postgresql.domain.FlywayFactoryBean; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index 3d8ab85..2ae6bd0 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -42,13 +42,13 @@ cassandra: write: LOCAL_QUORUM delete: LOCAL_QUORUM -mariadb: - driverClass: org.mariadb.jdbc.Driver +postgresql: + driverClass: org.postgresql.Driver database: seshat host: localhost - port: 3306 - user: root - password: mysql + port: 5
[fineract-cn-template] 22/38: Merge pull request #4 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 0e59b1fc1f333df640522b3b09df2c24dfe200bc Merge: bb33cd2 76d2aab Author: Myrle Krantz AuthorDate: Mon Apr 9 17:43:22 2018 +0200 Merge pull request #4 from myrle-krantz/develop Adding rat checks. api/build.gradle | 18 ++ api/settings.gradle| 17 + build.gradle | 24 component-test/build.gradle| 18 ++ component-test/settings.gradle | 17 + service/build.gradle | 18 ++ service/settings.gradle| 17 + settings.gradle| 17 + shared.gradle | 31 +++ 9 files changed, 177 insertions(+)
[fineract-cn-template] 32/38: Fixed Flyway migration scripts
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 09f93de68812aa9c5fca73c697bf9a27c776abb5 Author: Isaac Kamga AuthorDate: Thu May 2 03:25:35 2019 +0100 Fixed Flyway migration scripts --- service/src/main/resources/application.yml | 1 - .../src/main/resources/db/migrations/postgresql/V1__initial_setup.sql | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/service/src/main/resources/application.yml b/service/src/main/resources/application.yml index b987018..6123bd6 100644 --- a/service/src/main/resources/application.yml +++ b/service/src/main/resources/application.yml @@ -25,7 +25,6 @@ spring: enabled: false datasource: driver-class-name: org.postgresql.Driver -platform: postgres url: jdbc:postgresql://localhost:5432/seshat username: postgres password: postgres diff --git a/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql b/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql index 8e4ba15..d45736c 100644 --- a/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql +++ b/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql @@ -18,7 +18,7 @@ -- CREATE TABLE template_samples ( - id BIGINT NOT NULL AUTO_INCREMENT, + id BIGINT NOT NULL, identifier VARCHAR(8) NOT NULL, payload VARCHAR(512) NULL, CONSTRAINT template_samples_pk PRIMARY KEY (id)
[fineract-cn-template] 19/38: Merge pull request #2 from Izakey/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit bb33cd281400b4c3b72bd4fbb91901d3e6c734fd Merge: 01062a3 dfa46d6 Author: Myrle Krantz AuthorDate: Fri Mar 16 11:57:00 2018 +0100 Merge pull request #2 from Izakey/develop Updated copyright information on template HEADER | 25 -- NOTICE.txt | 5 + README.md | 6 +++--- .../mifos/template/api/v1/PermittableGroupIds.java | 25 -- .../api/v1/client/IamATeapotException.java | 25 -- .../template/api/v1/client/TemplateManager.java| 25 -- .../io/mifos/template/api/v1/domain/Sample.java| 25 -- .../template/api/v1/events/EventConstants.java | 25 -- .../mifos/template/api/v1/domain/SampleTest.java | 25 -- .../io/mifos/template/SuiteTestEnvironment.java| 25 -- .../main/java/io/mifos/template/TestSample.java| 25 -- .../src/main/java/io/mifos/template/TestSuite.java | 25 -- .../template/listener/MigrationEventListener.java | 25 -- .../template/listener/SampleEventListener.java | 25 -- .../mifos/template/service/ServiceConstants.java | 25 -- .../template/service/TemplateApplication.java | 25 -- .../template/service/TemplateConfiguration.java| 25 -- .../internal/command/InitializeServiceCommand.java | 25 -- .../service/internal/command/SampleCommand.java| 25 -- .../command/handler/MigrationAggregate.java| 25 -- .../internal/command/handler/SampleAggregate.java | 25 -- .../service/internal/mapper/SampleMapper.java | 25 -- .../internal/repository/SampleJpaEntity.java | 25 -- .../repository/SampleJpaEntityRepository.java | 25 -- .../service/internal/service/SampleService.java| 25 -- .../service/rest/SampleRestController.java | 25 -- service/src/main/resources/application.yml | 25 -- service/src/main/resources/bootstrap.yml | 25 -- .../db/migrations/mariadb/V1__initial_setup.sql| 25 -- shared.gradle | 2 -- 30 files changed, 386 insertions(+), 302 deletions(-)
[fineract-cn-template] 21/38: Adding rat checks.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 76d2aabe042d03f2b43af667ccf1555c951ecda6 Author: Myrle Krantz AuthorDate: Mon Apr 9 17:41:33 2018 +0200 Adding rat checks. --- api/build.gradle | 18 ++ api/settings.gradle| 17 + build.gradle | 24 component-test/build.gradle| 18 ++ component-test/settings.gradle | 17 + service/build.gradle | 18 ++ service/settings.gradle| 17 + settings.gradle| 17 + shared.gradle | 31 +++ 9 files changed, 177 insertions(+) diff --git a/api/build.gradle b/api/build.gradle index 1ed9d2b..5b9924a 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + buildscript { repositories { jcenter() @@ -10,6 +27,7 @@ buildscript { plugins { id "com.github.hierynomus.license" version "0.13.1" +id("org.nosphere.apache.rat") version "0.3.1" } apply from: '../shared.gradle' diff --git a/api/settings.gradle b/api/settings.gradle index 7c8e3dc..491f745 100644 --- a/api/settings.gradle +++ b/api/settings.gradle @@ -1 +1,18 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + rootProject.name = 'api' \ No newline at end of file diff --git a/build.gradle b/build.gradle index b82a3b2..848847a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + group 'org.apache.fineract.cn' task publishApiToMavenLocal { @@ -34,3 +51,10 @@ task licenseFormat { dependsOn gradle.includedBuild('service').task(':licenseFormat') dependsOn gradle.includedBuild('component-test').task(':licenseFormat') } + +task rat { +group 'all' +dependsOn gradle.includedBuild('api').task(':rat') +dependsOn gradle.includedBuild('service').task(':rat') +dependsOn gradle.includedBuild('component-test').task(':rat') +} diff --git a/component-test/build.gradle b/component-test/build.gradle index d8f99af..8611ca8 100644 --- a/component-test/build.gradle +++ b/component-test/build.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for addition
[fineract-cn-template] 24/38: Adjusting to package name changes in upstream repositories.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit c6b23d9f89d5e3412ac7e94721fdc01e5ee2eeb6 Author: Myrle Krantz AuthorDate: Fri Apr 13 16:53:27 2018 +0200 Adjusting to package name changes in upstream repositories. --- .../template/api/v1/client/TemplateManager.java| 7 +++ .../io/mifos/template/api/v1/domain/Sample.java| 5 ++--- .../mifos/template/api/v1/domain/SampleTest.java | 9 - .../io/mifos/template/SuiteTestEnvironment.java| 6 +++--- .../main/java/io/mifos/template/TestSample.java| 22 +- .../template/listener/MigrationEventListener.java | 4 ++-- .../template/listener/SampleEventListener.java | 4 ++-- .../template/service/TemplateConfiguration.java| 14 +++--- .../command/handler/MigrationAggregate.java| 15 +++ .../internal/command/handler/SampleAggregate.java | 8 .../repository/SampleJpaEntityRepository.java | 3 +-- .../service/rest/SampleRestController.java | 20 12 files changed, 60 insertions(+), 57 deletions(-) diff --git a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java b/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java index 96cfc98..f4d7037 100644 --- a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java +++ b/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java @@ -18,9 +18,10 @@ */ package io.mifos.template.api.v1.client; -import io.mifos.core.api.annotation.ThrowsException; -import io.mifos.core.api.util.CustomFeignClientsConfiguration; import io.mifos.template.api.v1.domain.Sample; +import java.util.List; +import org.apache.fineract.cn.api.annotation.ThrowsException; +import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration; import org.springframework.cloud.netflix.feign.FeignClient; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; @@ -28,8 +29,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; -import java.util.List; - @SuppressWarnings("unused") @FeignClient(value="template-v1", path="/template/v1", configuration = CustomFeignClientsConfiguration.class) public interface TemplateManager { diff --git a/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java b/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java index 12549e9..12bf046 100644 --- a/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java +++ b/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java @@ -18,10 +18,9 @@ */ package io.mifos.template.api.v1.domain; -import io.mifos.core.lang.validation.constraints.ValidIdentifier; -import org.hibernate.validator.constraints.Length; - import java.util.Objects; +import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; +import org.hibernate.validator.constraints.Length; @SuppressWarnings({"WeakerAccess", "unused"}) public class Sample { diff --git a/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java b/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java index eab7ef9..eb6dd03 100644 --- a/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java +++ b/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java @@ -18,13 +18,12 @@ */ package io.mifos.template.api.v1.domain; -import io.mifos.core.test.domain.ValidationTest; -import io.mifos.core.test.domain.ValidationTestCase; -import org.apache.commons.lang.RandomStringUtils; -import org.junit.runners.Parameterized; - import java.util.ArrayList; import java.util.Collection; +import org.apache.commons.lang.RandomStringUtils; +import org.apache.fineract.cn.test.domain.ValidationTest; +import org.apache.fineract.cn.test.domain.ValidationTestCase; +import org.junit.runners.Parameterized; public class SampleTest extends ValidationTest { diff --git a/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java index a5eaa0d..3ec0a44 100644 --- a/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java +++ b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java @@ -18,9 +18,9 @@ */ package io.mifos.template; -import io.mifos.core.test.env.TestEnvironment; -import io.mifos.core.test.fixture.cassandra.CassandraInitializer; -import io.mifos.core.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.env.TestEnvironment; +import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; +import org.apache.fineract.cn.test.fixture.mariadb.MariaD
[fineract-cn-template] 06/38: Merge pull request #2 from mgeiss/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit d9745aa49188b07df5ad5f328dcf7e9ac6da2b6b Merge: ec0791d a0d25be Author: Markus Geiß AuthorDate: Wed Apr 26 20:07:26 2017 +0200 Merge pull request #2 from mgeiss/develop added path configurer to allow dots in url .../java/io/mifos/template/service/TemplateConfiguration.java| 9 - 1 file changed, 8 insertions(+), 1 deletion(-)
[fineract-cn-template] 23/38: Merge pull request #3 from ebenezergraham/patch-1
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 54482d06928b7a28c4f937e3f2ced35dc41d48db Merge: 0e59b1f 9b42378 Author: Myrle Krantz AuthorDate: Mon Apr 9 17:43:49 2018 +0200 Merge pull request #3 from ebenezergraham/patch-1 Updated readme.md to use Apache Finearct CN README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[fineract-cn-template] 14/38: Merge pull request #5 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 08f84198fe12b8b7547ef6c104a3be23558278be Merge: 7232d32 f35c15c Author: Myrle Krantz AuthorDate: Wed Jul 12 23:42:22 2017 +0200 Merge pull request #5 from myrle-krantz/develop removing duplicate resources from build artifacts. shared.gradle | 1 + 1 file changed, 1 insertion(+)
[fineract-cn-template] 27/38: Merge pull request #5 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 66862749b2f71f12fbe32a9855fe6a3a8c2faa0e Merge: 54482d0 981ca5a Author: Myrle Krantz AuthorDate: Mon Apr 16 21:16:15 2018 +0200 Merge pull request #5 from myrle-krantz/develop Updating package names. README.md | 8 ++--- .../cn}/template/api/v1/PermittableGroupIds.java | 2 +- .../api/v1/client/IamATeapotException.java | 2 +- .../template/api/v1/client/TemplateManager.java| 11 +++ .../cn}/template/api/v1/domain/Sample.java | 7 ++--- .../cn}/template/api/v1/events/EventConstants.java | 2 +- .../cn}/template/api/v1/domain/SampleTest.java | 11 +++ .../cn}/template/SuiteTestEnvironment.java | 8 ++--- .../apache/fineract/cn}/template/TestSample.java | 36 -- .../apache/fineract/cn}/template/TestSuite.java| 2 +- .../template/listener/MigrationEventListener.java | 8 ++--- .../cn}/template/listener/SampleEventListener.java | 8 ++--- .../cn}/template/service/ServiceConstants.java | 2 +- .../cn}/template/service/TemplateApplication.java | 2 +- .../template/service/TemplateConfiguration.java| 26 .../internal/command/InitializeServiceCommand.java | 2 +- .../service/internal/command/SampleCommand.java| 4 +-- .../command/handler/MigrationAggregate.java| 23 +++--- .../internal/command/handler/SampleAggregate.java | 18 +-- .../service/internal/mapper/SampleMapper.java | 6 ++-- .../internal/repository/SampleJpaEntity.java | 2 +- .../repository/SampleJpaEntityRepository.java | 5 ++- .../service/internal/service/SampleService.java| 8 ++--- .../service/rest/SampleRestController.java | 34 +++- 24 files changed, 119 insertions(+), 118 deletions(-)
[fineract-cn-template] 12/38: Merge pull request #4 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 7232d32efa7531b34a8adae0d27bb05ceda5b20a Merge: 6b00c28 486ae6b Author: Myrle Krantz AuthorDate: Mon Jul 10 12:16:57 2017 +0200 Merge pull request #4 from myrle-krantz/develop Changed initialize payload to the version number as agreed. .../src/main/java/io/mifos/template/SuiteTestEnvironment.java | 4 +++- component-test/src/main/java/io/mifos/template/TestSample.java| 2 +- .../service/internal/command/handler/MigrationAggregate.java | 8 ++-- 3 files changed, 10 insertions(+), 4 deletions(-)
[fineract-cn-template] 10/38: Merge pull request #3 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 6b00c28ab9002b5fb186c2f7662271e5ed344abd Merge: d9745aa 9e03ed8 Author: Myrle Krantz AuthorDate: Mon Jul 10 12:08:59 2017 +0200 Merge pull request #3 from myrle-krantz/develop added helpful examples to template. .../api/v1/{ => events}/EventConstants.java| 2 +- .../io/mifos/template/SuiteTestEnvironment.java| 43 ++ .../main/java/io/mifos/template/TestSample.java| 36 -- .../src/main/java/io/mifos/template/TestSuite.java | 14 --- .../template/listener/MigrationEventListener.java | 2 +- .../template/listener/SampleEventListener.java | 2 +- .../internal/command/InitializeServiceCommand.java | 5 +++ .../service/internal/command/SampleCommand.java| 7 .../command/handler/MigrationAggregate.java| 5 ++- .../internal/command/handler/SampleAggregate.java | 17 - 10 files changed, 100 insertions(+), 33 deletions(-)
[fineract-cn-template] 04/38: Merge pull request #1 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit ec0791dcdfd7fc91c0a5876f9810d5c349407aaf Merge: e51bec1 8a38bb1 Author: Myrle Krantz AuthorDate: Tue Apr 4 17:13:14 2017 +0200 Merge pull request #1 from myrle-krantz/develop adding example for api domain object testing. api/build.gradle | 4 ++ .../io/mifos/template/api/v1/EventConstants.java | 2 +- .../mifos/template/api/v1/PermittableGroupIds.java | 2 +- .../api/v1/client/IamATeapotException.java | 2 +- .../template/api/v1/client/TemplateManager.java| 2 +- .../io/mifos/template/api/v1/domain/Sample.java| 2 +- .../mifos/template/api/v1/domain/SampleTest.java | 55 ++ .../main/java/io/mifos/template/TestSample.java| 2 +- .../template/listener/MigrationEventListener.java | 2 +- .../template/listener/SampleEventListener.java | 2 +- .../mifos/template/service/ServiceConstants.java | 2 +- .../template/service/TemplateApplication.java | 2 +- .../template/service/TemplateConfiguration.java| 2 +- .../internal/command/InitializeServiceCommand.java | 2 +- .../service/internal/command/SampleCommand.java| 2 +- .../command/handler/MigrationAggregate.java| 2 +- .../internal/command/handler/SampleAggregate.java | 2 +- .../service/internal/mapper/SampleMapper.java | 2 +- .../internal/repository/SampleJpaEntity.java | 2 +- .../repository/SampleJpaEntityRepository.java | 2 +- .../service/internal/service/SampleService.java| 2 +- .../service/rest/SampleRestController.java | 2 +- service/src/main/resources/application.yml | 2 +- service/src/main/resources/bootstrap.yml | 2 +- .../db/migrations/mariadb/V1__initial_setup.sql| 2 +- 25 files changed, 82 insertions(+), 23 deletions(-)
[fineract-cn-template] 16/38: Merge pull request #1 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 01062a38d32bbd2f3248b96217cdb87a15c97aba Merge: 08f8419 1c25310 Author: Myrle Krantz AuthorDate: Mon Feb 26 18:36:40 2018 +0100 Merge pull request #1 from myrle-krantz/develop updating artifact ids to apache fineract from mifos io api/build.gradle| 4 ++-- build.gradle| 2 +- component-test/build.gradle | 12 ++-- service/build.gradle| 14 +++--- shared.gradle | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-)
[fineract-cn-template] 26/38: Removing last references to mifos.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 981ca5ace7b75b054235b886cb84e6f981717854 Author: Myrle Krantz AuthorDate: Fri Apr 13 17:01:12 2018 +0200 Removing last references to mifos. --- README.md | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 0a1f496..0c955ed 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # Apache Fineract CN Template -[![Join the chat at https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge_medium=badge_campaign=pr-badge_content=badge) - -This project provides a template layout for all Apache Fineract CN microservices. +This project provides a template layout for all Apache Fineract CN services. ## Abstract Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world. @@ -25,11 +23,11 @@ Apache Fineract CN is an application framework for digital financial services, a gradle wrapper -6. Open all module specific build.gradle files (api, service, and component-test) and replace value of _group_ with io.mifos.{project name} +6. Open all module specific build.gradle files (api, service, and component-test) and replace value of _group_ with org.apache.fineract.cn.{project name} 7. Import project into IDE -8. Rename all org.apache.fineract.cn.template packages to io.mifos.{project name} +8. Rename all org.apache.fineract.cn.template packages to org.apache.fineract.cn.{project name} 9. Open _SampleRestConfiguration_ and _SampleServiceConfiguration_, adjust @ComponentScan to reflect the new package name
[fineract-cn-template] 37/38: Merge pull request #1 from ebenezergraham/FINCN-2
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 666d932b01348ddeb2531c83b78fbe9c2df743ec Merge: c83f004 5aece2e Author: Isaac Kamga AuthorDate: Sun Aug 25 18:01:58 2019 +0100 Merge pull request #1 from ebenezergraham/FINCN-2 Enabling database-level sequence generation with pseudotypes .gitignore | 3 ++- .../src/main/resources/db/migrations/postgresql/V1__initial_setup.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-)
[fineract-cn-template] 31/38: Merge pull request #7 from aasaru/artifactory
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit e3a2b0bf4664328e5e9828bf581e4d8bbe25b0ec Merge: 6686274 ae271bb Author: Awasum Yannick AuthorDate: Tue Apr 30 09:20:41 2019 +0100 Merge pull request #7 from aasaru/artifactory FINCN-148 build with travis-ci.com and upload artifacts to Artifactory .travis.yml | 30 +++ README.md | 7 - api/build.gradle| 3 +- build.gradle| 8 + component-test/build.gradle | 4 ++- service/build.gradle| 5 ++-- shared.gradle | 18 travis.sh | 71 + 8 files changed, 141 insertions(+), 5 deletions(-)
[fineract-cn-template] 13/38: removing duplicate resources from build artifacts.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit f35c15cb56174f79e8cb87425d9b960c7dd7f98c Author: Myrle Krantz AuthorDate: Wed Jul 12 23:32:58 2017 +0200 removing duplicate resources from build artifacts. --- shared.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/shared.gradle b/shared.gradle index 4a79b9c..1bfef46 100644 --- a/shared.gradle +++ b/shared.gradle @@ -53,6 +53,7 @@ dependencies { jar { from sourceSets.main.allSource +duplicatesStrategy = DuplicatesStrategy.EXCLUDE } license {
[fineract-cn-template] 18/38: Removed unused year and name variables
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit dfa46d62bf93f0a1e59a34b4ca43999b6224efd5 Author: Isaac Kamga AuthorDate: Mon Mar 5 21:23:04 2018 +0100 Removed unused year and name variables --- shared.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/shared.gradle b/shared.gradle index 6542efb..afa045a 100644 --- a/shared.gradle +++ b/shared.gradle @@ -65,6 +65,4 @@ license { yml = 'SCRIPT_STYLE' yaml = 'SCRIPT_STYLE' } -ext.year = Calendar.getInstance().get(Calendar.YEAR) -ext.name = 'The Apache Software Foundation' }
[fineract-cn-template] branch develop updated (d7c232d -> 9e47fb4)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git. from d7c232d Merge pull request #8 from ebenezergraham/FINCN-157 new 4e85c4e Migrate template service from MariaDB to PostgreSQL new db65864 Migrate template service from MariaDB to PostgreSQL new 09f93de Fixed Flyway migration scripts new c83f004 Ensure flyway migrations target right database new 5aece2e Enabling database-level sequence generation with pseudotypes new 666d932 Merge pull request #1 from ebenezergraham/FINCN-2 new 9e47fb4 Merge pull request #6 from Izakey/FINCN-120 The 38 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore| 3 ++- NOTICE.txt| 2 +- .../apache/fineract/cn/template/SuiteTestEnvironment.java | 6 +++--- .../java/org/apache/fineract/cn/template/TestSample.java | 2 +- service/build.gradle | 2 +- .../cn/template/service/TemplateConfiguration.java| 4 ++-- .../internal/command/handler/MigrationAggregate.java | 2 +- service/src/main/resources/application.yml| 15 ++- .../{mariadb => postgresql}/V1__initial_setup.sql | 2 +- shared.gradle | 5 +++-- 10 files changed, 25 insertions(+), 18 deletions(-) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V1__initial_setup.sql (96%)
[fineract-cn-template] 07/38: Provided example necessary for running multiple tests as a suite. This is a pre-req for continuous integration.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 15528625ed719bc3350f337f0f59b6e3e0ff7f4f Author: Myrle Krantz AuthorDate: Mon Jul 10 11:51:53 2017 +0200 Provided example necessary for running multiple tests as a suite. This is a pre-req for continuous integration. --- .../io/mifos/template/SuiteTestEnvironment.java| 43 ++ .../main/java/io/mifos/template/TestSample.java| 34 +++-- .../src/main/java/io/mifos/template/TestSuite.java | 27 ++ 3 files changed, 84 insertions(+), 20 deletions(-) diff --git a/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java new file mode 100644 index 000..dd5bfd0 --- /dev/null +++ b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java @@ -0,0 +1,43 @@ +/* + * Copyright 2017 The Mifos Initiative. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.mifos.template; + +import io.mifos.core.test.env.TestEnvironment; +import io.mifos.core.test.fixture.cassandra.CassandraInitializer; +import io.mifos.core.test.fixture.mariadb.MariaDBInitializer; +import org.junit.ClassRule; +import org.junit.rules.RuleChain; +import org.junit.rules.RunExternalResourceOnce; +import org.junit.rules.TestRule; + +/** + * This contains the database resources required by the test. They are in a separate + * class so that the test suite can initialize them before the classes it calls. This + * makes test runs faster and prevents tests from "stepping on each other's toes" when + * initializing and de-initializing external resources. + */ +public class SuiteTestEnvironment { + static final String APP_NAME = "template-v1"; + static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); + static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); + static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); + + @ClassRule + public static TestRule orderClassRules = RuleChain + .outerRule(new RunExternalResourceOnce(testEnvironment)) + .around(new RunExternalResourceOnce(cassandraInitializer)) + .around(new RunExternalResourceOnce(mariaDBInitializer)); +} diff --git a/component-test/src/main/java/io/mifos/template/TestSample.java b/component-test/src/main/java/io/mifos/template/TestSample.java index b829355..9e90129 100644 --- a/component-test/src/main/java/io/mifos/template/TestSample.java +++ b/component-test/src/main/java/io/mifos/template/TestSample.java @@ -17,10 +17,7 @@ package io.mifos.template; import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; import io.mifos.core.api.context.AutoUserContext; -import io.mifos.core.test.env.TestEnvironment; import io.mifos.core.test.fixture.TenantDataStoreContextTestRule; -import io.mifos.core.test.fixture.cassandra.CassandraInitializer; -import io.mifos.core.test.fixture.mariadb.MariaDBInitializer; import io.mifos.core.test.listener.EnableEventRecording; import io.mifos.core.test.listener.EventRecorder; import io.mifos.template.api.v1.EventConstants; @@ -29,12 +26,11 @@ import io.mifos.template.api.v1.domain.Sample; import io.mifos.template.service.TemplateConfiguration; import org.apache.commons.lang3.RandomStringUtils; import org.junit.*; -import org.junit.rules.RuleChain; -import org.junit.rules.TestRule; import org.junit.runner.RunWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.cloud.netflix.feign.EnableFeignClients; import org.springframework.cloud.netflix.ribbon.RibbonClient; @@ -48,9 +44,10 @@ import java.util.List; @RunWith(SpringRunner.class) @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT) -public class TestSample { +public class TestSample extends SuiteTestEnvironment { + private static final String LOGGER_NAME = "test-logger"; + private static final String TEST_USER = "homer"; - private static final String APP_NAME = "template-v1"; @C
[fineract-cn-template] 01/38: Initial Commit
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit e51bec140fe7f7f19a1fa8ac5f89e44c50359919 Author: Markus Geiss AuthorDate: Wed Mar 15 08:06:19 2017 +0100 Initial Commit --- .gitignore | 16 ++ HEADER | 13 ++ LICENSE| 201 + README.md | 66 +++ api/build.gradle | 35 api/settings.gradle| 1 + .../io/mifos/template/api/v1/EventConstants.java | 27 +++ .../mifos/template/api/v1/PermittableGroupIds.java | 22 +++ .../api/v1/client/IamATeapotException.java | 20 ++ .../template/api/v1/client/TemplateManager.java| 57 ++ .../io/mifos/template/api/v1/domain/Sample.java| 70 +++ build.gradle | 36 component-test/build.gradle| 38 component-test/settings.gradle | 1 + .../main/java/io/mifos/template/TestSample.java| 136 ++ .../template/listener/MigrationEventListener.java | 47 + .../template/listener/SampleEventListener.java | 47 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54212 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew| 172 ++ gradlew.bat| 84 + service/build.gradle | 63 +++ service/settings.gradle| 1 + .../mifos/template/service/ServiceConstants.java | 20 ++ .../template/service/TemplateApplication.java | 29 +++ .../template/service/TemplateConfiguration.java| 64 +++ .../internal/command/InitializeServiceCommand.java | 23 +++ .../service/internal/command/SampleCommand.java| 32 .../command/handler/MigrationAggregate.java| 60 ++ .../internal/command/handler/SampleAggregate.java | 52 ++ .../service/internal/mapper/SampleMapper.java | 43 + .../internal/repository/SampleJpaEntity.java | 61 +++ .../repository/SampleJpaEntityRepository.java | 26 +++ .../service/internal/service/SampleService.java| 45 + .../service/rest/SampleRestController.java | 112 service/src/main/resources/application.yml | 66 +++ service/src/main/resources/bootstrap.yml | 19 ++ .../db/migrations/mariadb/V1__initial_setup.sql| 22 +++ settings.gradle| 6 + shared.gradle | 69 +++ 40 files changed, 1908 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..f9d7cba --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +.gradle +.idea +build/ +target/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +*.iml + +*.log + +*.toDelete diff --git a/HEADER b/HEADER new file mode 100644 index 000..4b2eadf --- /dev/null +++ b/HEADER @@ -0,0 +1,13 @@ +Copyright ${year} ${name}. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..8dada3e --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indir
[fineract-cn-template] 35/38: Merge pull request #8 from ebenezergraham/FINCN-157
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit d7c232dd555d88cf6d7b8e477162a9a5596df4e4 Merge: e3a2b0b bccb1ac Author: Awasum Yannick AuthorDate: Mon Jun 3 20:11:10 2019 +0100 Merge pull request #8 from ebenezergraham/FINCN-157 Adding rat report to After Failure procedure .travis.yml | 3 +++ shared.gradle | 1 + 2 files changed, 4 insertions(+)
[fineract-cn-template] 20/38: Updated readme.md to use Apache Finearct CN
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 9b42378f673bfc704ce46bba4eb708e2f8489789 Author: Ebenezer Graham AuthorDate: Fri Apr 6 21:31:34 2018 +0400 Updated readme.md to use Apache Finearct CN --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c5ad0cd..3f20df9 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![Join the chat at https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge_medium=badge_campaign=pr-badge_content=badge) -This project provides a template layout for all Mifos I/O microservices. +This project provides a template layout for all Apache Fineract CN microservices. ## Abstract Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world.
[fineract-cn-template] 15/38: updating artifact ids to apache fineract from mifos io
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 1c2531067507dbe5953fd2b3b3d19c27596681ef Author: Myrle Krantz AuthorDate: Mon Feb 26 18:21:45 2018 +0100 updating artifact ids to apache fineract from mifos io --- api/build.gradle| 4 ++-- build.gradle| 2 +- component-test/build.gradle | 12 ++-- service/build.gradle| 14 +++--- shared.gradle | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api/build.gradle b/api/build.gradle index 17c6648..1ed9d2b 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -17,13 +17,13 @@ apply from: '../shared.gradle' dependencies { compile( [group: 'org.springframework.cloud', name: 'spring-cloud-starter-feign'], -[group: 'io.mifos.core', name: 'api', version: versions.frameworkapi], +[group: 'org.apache.fineract.cn', name: 'api', version: versions.frameworkapi], [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator], [group: 'org.hibernate', name: 'hibernate-validator-annotation-processor', version: versions.validator] ) testCompile( -[group: 'io.mifos.core', name: 'test', version: versions.frameworktest], +[group: 'org.apache.fineract.cn', name: 'test', version: versions.frameworktest], ) } diff --git a/build.gradle b/build.gradle index b30bd55..b82a3b2 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'io.mifos' +group 'org.apache.fineract.cn' task publishApiToMavenLocal { dependsOn gradle.includedBuild('api').task(':publishToMavenLocal') diff --git a/component-test/build.gradle b/component-test/build.gradle index 7818273..d8f99af 100644 --- a/component-test/build.gradle +++ b/component-test/build.gradle @@ -19,12 +19,12 @@ apply from: '../shared.gradle' dependencies { compile( -[group: 'io.mifos.template', name: 'api', version: project.version], -[group: 'io.mifos.template', name: 'service', version: project.version], -[group: 'io.mifos.anubis', name: 'test', version: versions.frameworkanubis], -[group: 'io.mifos.core', name: 'api', version: versions.frameworkapi], -[group: 'io.mifos.core', name: 'test', version: versions.frameworktest], -[group: 'io.mifos.core', name: 'lang', version: versions.frameworklang], +[group: 'org.apache.fineract.cn.template', name: 'api', version: project.version], +[group: 'org.apache.fineract.cn.template', name: 'service', version: project.version], +[group: 'org.apache.fineract.cn.anubis', name: 'test', version: versions.frameworkanubis], +[group: 'org.apache.fineract.cn', name: 'api', version: versions.frameworkapi], +[group: 'org.apache.fineract.cn', name: 'test', version: versions.frameworktest], +[group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], [group: 'org.springframework.boot', name: 'spring-boot-starter-test'] ) } diff --git a/service/build.gradle b/service/build.gradle index a9b4de9..b6ea00a 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -30,14 +30,14 @@ dependencies { [group: 'org.springframework.cloud', name: 'spring-cloud-starter-config'], [group: 'org.springframework.cloud', name: 'spring-cloud-starter-eureka'], [group: 'org.springframework.boot', name: 'spring-boot-starter-jetty'], -[group: 'io.mifos.template', name: 'api', version: project.version], -[group: 'io.mifos.anubis', name: 'library', version: versions.frameworkanubis], +[group: 'org.apache.fineract.cn.template', name: 'api', version: project.version], +[group: 'org.apache.fineract.cn.anubis', name: 'library', version: versions.frameworkanubis], [group: 'com.google.code.gson', name: 'gson'], -[group: 'io.mifos.core', name: 'lang', version: versions.frameworklang], -[group: 'io.mifos.core', name: 'async', version: versions.frameworkasync], -[group: 'io.mifos.core', name: 'cassandra', version: versions.frameworkcassandra], -[group: 'io.mifos.core', name: 'mariadb', version: versions.frameworkmariadb], -[group: 'io.mifos.core', name: 'command', version: versions.frameworkcommand], +[group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], +[group: 'org.apache.fineract.cn', name: 'async', version: versions.frameworkasync], +[group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra], +[group: 'org.apache.fineract.cn', name: 'mariadb', version
[fineract-cn-template] 36/38: Enabling database-level sequence generation with pseudotypes
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 5aece2ef15e2a634ae6bf1b71ad6fb0590bfb14e Author: ebenezergraham AuthorDate: Sun Jul 14 06:33:05 2019 +0400 Enabling database-level sequence generation with pseudotypes --- .gitignore | 3 ++- .../src/main/resources/db/migrations/postgresql/V1__initial_setup.sql | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f9d7cba..554b089 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,8 @@ .idea build/ target/ - +**/out +**/build # Ignore Gradle GUI config gradle-app.setting diff --git a/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql b/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql index d45736c..2598274 100644 --- a/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql +++ b/service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql @@ -18,7 +18,7 @@ -- CREATE TABLE template_samples ( - id BIGINT NOT NULL, + id BIGSERIAL, identifier VARCHAR(8) NOT NULL, payload VARCHAR(512) NULL, CONSTRAINT template_samples_pk PRIMARY KEY (id)
[fineract-cn-template] 02/38: Making headers consistent.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit ba7f6cf26b7917e20720b4678cefb4205987aa6c Author: myrle-krantz AuthorDate: Tue Apr 4 16:50:52 2017 +0200 Making headers consistent. --- api/src/main/java/io/mifos/template/api/v1/EventConstants.java | 2 +- api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java | 2 +- .../main/java/io/mifos/template/api/v1/client/IamATeapotException.java | 2 +- api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java | 2 +- api/src/main/java/io/mifos/template/api/v1/domain/Sample.java | 2 +- component-test/src/main/java/io/mifos/template/TestSample.java | 2 +- .../main/java/io/mifos/template/listener/MigrationEventListener.java| 2 +- .../src/main/java/io/mifos/template/listener/SampleEventListener.java | 2 +- service/src/main/java/io/mifos/template/service/ServiceConstants.java | 2 +- .../src/main/java/io/mifos/template/service/TemplateApplication.java| 2 +- .../src/main/java/io/mifos/template/service/TemplateConfiguration.java | 2 +- .../template/service/internal/command/InitializeServiceCommand.java | 2 +- .../java/io/mifos/template/service/internal/command/SampleCommand.java | 2 +- .../template/service/internal/command/handler/MigrationAggregate.java | 2 +- .../template/service/internal/command/handler/SampleAggregate.java | 2 +- .../java/io/mifos/template/service/internal/mapper/SampleMapper.java| 2 +- .../io/mifos/template/service/internal/repository/SampleJpaEntity.java | 2 +- .../template/service/internal/repository/SampleJpaEntityRepository.java | 2 +- .../java/io/mifos/template/service/internal/service/SampleService.java | 2 +- .../main/java/io/mifos/template/service/rest/SampleRestController.java | 2 +- service/src/main/resources/application.yml | 2 +- service/src/main/resources/bootstrap.yml| 2 +- service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/api/src/main/java/io/mifos/template/api/v1/EventConstants.java b/api/src/main/java/io/mifos/template/api/v1/EventConstants.java index ec508b0..69b1343 100644 --- a/api/src/main/java/io/mifos/template/api/v1/EventConstants.java +++ b/api/src/main/java/io/mifos/template/api/v1/EventConstants.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Mifos Initiative + * Copyright 2017 The Mifos Initiative. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java b/api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java index 2a3bdb1..239e2ac 100644 --- a/api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java +++ b/api/src/main/java/io/mifos/template/api/v1/PermittableGroupIds.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Mifos Initiative + * Copyright 2017 The Mifos Initiative. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/src/main/java/io/mifos/template/api/v1/client/IamATeapotException.java b/api/src/main/java/io/mifos/template/api/v1/client/IamATeapotException.java index c1c9e74..ec4383c 100644 --- a/api/src/main/java/io/mifos/template/api/v1/client/IamATeapotException.java +++ b/api/src/main/java/io/mifos/template/api/v1/client/IamATeapotException.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Mifos Initiative + * Copyright 2017 The Mifos Initiative. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java b/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java index 6b0cb4c..9914e36 100644 --- a/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java +++ b/api/src/main/java/io/mifos/template/api/v1/client/TemplateManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Mifos Initiative + * Copyright 2017 The Mifos Initiative. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java b/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java index d3dbd54..6f25719 100644 --- a/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java +++ b/api/src/main/java/io/mifos/template/api/v1/domain/Sample.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 The Mifos Initiative + * Copyright 2017 The Mifos Initiative. * * Li
[fineract-cn-template] 09/38: Provided example for hands-off command handler logging, and documented it's constraints.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 9e03ed87002217cca55d8d91823f95254432f75b Author: Myrle Krantz AuthorDate: Mon Jul 10 12:05:02 2017 +0200 Provided example for hands-off command handler logging, and documented it's constraints. --- .../internal/command/InitializeServiceCommand.java| 5 + .../template/service/internal/command/SampleCommand.java | 7 +++ .../internal/command/handler/MigrationAggregate.java | 2 +- .../service/internal/command/handler/SampleAggregate.java | 15 ++- 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/service/src/main/java/io/mifos/template/service/internal/command/InitializeServiceCommand.java b/service/src/main/java/io/mifos/template/service/internal/command/InitializeServiceCommand.java index db85b9d..e02d2d0 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/InitializeServiceCommand.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/InitializeServiceCommand.java @@ -20,4 +20,9 @@ public class InitializeServiceCommand { public InitializeServiceCommand() { super(); } + + @Override + public String toString() { +return "InitializeServiceCommand{}"; + } } diff --git a/service/src/main/java/io/mifos/template/service/internal/command/SampleCommand.java b/service/src/main/java/io/mifos/template/service/internal/command/SampleCommand.java index 8ee6d92..5957f1b 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/SampleCommand.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/SampleCommand.java @@ -29,4 +29,11 @@ public class SampleCommand { public Sample sample() { return this.sample; } + + @Override + public String toString() { +return "SampleCommand{" + +"sample=" + sample.getIdentifier() + +'}'; + } } diff --git a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java index 083513c..920465a 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java @@ -50,7 +50,7 @@ public class MigrationAggregate { this.flywayFactoryBean = flywayFactoryBean; } - @CommandHandler + @CommandHandler(logStart = CommandLogLevel.INFO, logFinish = CommandLogLevel.INFO) @Transactional @EventEmitter(selectorName = EventConstants.SELECTOR_NAME, selectorValue = EventConstants.INITIALIZE) public String initialize(final InitializeServiceCommand initializeServiceCommand) { diff --git a/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java b/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java index b2e8d5d..9a7c572 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/handler/SampleAggregate.java @@ -17,6 +17,7 @@ package io.mifos.template.service.internal.command.handler; import io.mifos.core.command.annotation.Aggregate; import io.mifos.core.command.annotation.CommandHandler; +import io.mifos.core.command.annotation.CommandLogLevel; import io.mifos.core.command.annotation.EventEmitter; import io.mifos.template.api.v1.events.EventConstants; import io.mifos.template.service.internal.command.SampleCommand; @@ -37,7 +38,19 @@ public class SampleAggregate { this.sampleJpaEntityRepository = sampleJpaEntityRepository; } - @CommandHandler + //TODO: Think about your command handler logging, then delete this comment. + // The log levels provided in the command handler cause log messages to be emitted each time this + // command handler is called before and after the call. Before the call, the command is logged + // using its toString() method, and after the call, the emitted event is logged via its toString() + // method. + // + // If you wish to adjust the information in the log messages, do so via the toString() methods. + // Financial transactions, passwords, and customer address data are examples of information which + // should not be placed in the logs. + // + // If a command handler should not emit a log message, change logStart and logFinish to: + // CommandLogLevel.NONE. + @CommandHandler(logStart = CommandLogLevel.INFO, logFinish = CommandLogLevel.INFO) @Transactional @EventEmitter(selectorName = EventConstants.SELECTOR_NAME, selectorValue = EventConstants.POST_SAMPLE) public String sample(final SampleCommand sampleCommand) {
[fineract-cn-template] 08/38: moved EventConstants to events package. events package is the appropriate location for multi-parameter event classes.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 7a59849308aff186b7fb286923428799221232c0 Author: Myrle Krantz AuthorDate: Mon Jul 10 12:02:16 2017 +0200 moved EventConstants to events package. events package is the appropriate location for multi-parameter event classes. --- .../java/io/mifos/template/api/v1/{ => events}/EventConstants.java | 2 +- component-test/src/main/java/io/mifos/template/TestSample.java | 2 +- .../main/java/io/mifos/template/listener/MigrationEventListener.java | 2 +- .../src/main/java/io/mifos/template/listener/SampleEventListener.java | 2 +- .../template/service/internal/command/handler/MigrationAggregate.java | 3 ++- .../template/service/internal/command/handler/SampleAggregate.java | 2 +- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/api/src/main/java/io/mifos/template/api/v1/EventConstants.java b/api/src/main/java/io/mifos/template/api/v1/events/EventConstants.java similarity index 95% rename from api/src/main/java/io/mifos/template/api/v1/EventConstants.java rename to api/src/main/java/io/mifos/template/api/v1/events/EventConstants.java index 69b1343..6207c03 100644 --- a/api/src/main/java/io/mifos/template/api/v1/EventConstants.java +++ b/api/src/main/java/io/mifos/template/api/v1/events/EventConstants.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package io.mifos.template.api.v1; +package io.mifos.template.api.v1.events; @SuppressWarnings("unused") public interface EventConstants { diff --git a/component-test/src/main/java/io/mifos/template/TestSample.java b/component-test/src/main/java/io/mifos/template/TestSample.java index 9e90129..924512b 100644 --- a/component-test/src/main/java/io/mifos/template/TestSample.java +++ b/component-test/src/main/java/io/mifos/template/TestSample.java @@ -20,7 +20,7 @@ import io.mifos.core.api.context.AutoUserContext; import io.mifos.core.test.fixture.TenantDataStoreContextTestRule; import io.mifos.core.test.listener.EnableEventRecording; import io.mifos.core.test.listener.EventRecorder; -import io.mifos.template.api.v1.EventConstants; +import io.mifos.template.api.v1.events.EventConstants; import io.mifos.template.api.v1.client.TemplateManager; import io.mifos.template.api.v1.domain.Sample; import io.mifos.template.service.TemplateConfiguration; diff --git a/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java b/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java index 82408bb..52be53b 100644 --- a/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java +++ b/component-test/src/main/java/io/mifos/template/listener/MigrationEventListener.java @@ -17,7 +17,7 @@ package io.mifos.template.listener; import io.mifos.core.lang.config.TenantHeaderFilter; import io.mifos.core.test.listener.EventRecorder; -import io.mifos.template.api.v1.EventConstants; +import io.mifos.template.api.v1.events.EventConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; import org.springframework.messaging.handler.annotation.Header; diff --git a/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java b/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java index 2e3c2cb..b54a819 100644 --- a/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java +++ b/component-test/src/main/java/io/mifos/template/listener/SampleEventListener.java @@ -17,7 +17,7 @@ package io.mifos.template.listener; import io.mifos.core.lang.config.TenantHeaderFilter; import io.mifos.core.test.listener.EventRecorder; -import io.mifos.template.api.v1.EventConstants; +import io.mifos.template.api.v1.events.EventConstants; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; import org.springframework.messaging.handler.annotation.Header; diff --git a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java index e4e3de1..083513c 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java @@ -17,9 +17,10 @@ package io.mifos.template.service.internal.command.handler; import io.mifos.core.command.annotation.Aggregate; import io.mifos.core.command.annotation.CommandHandler; +import io.mifos.core.command.annotation.CommandLogLevel; import io.mifos.core.command.annotation.EventEmi
[fineract-cn-template] 05/38: added path configurer to allow dots in url
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit a0d25be681d7a3cd5033068eb735b02009408798 Author: mgeiss AuthorDate: Wed Apr 26 18:12:55 2017 +0200 added path configurer to allow dots in url --- .../java/io/mifos/template/service/TemplateConfiguration.java| 9 - 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java b/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java index d0fd484..33ee609 100644 --- a/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java +++ b/service/src/main/java/io/mifos/template/service/TemplateConfiguration.java @@ -30,6 +30,8 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.web.servlet.config.annotation.PathMatchConfigurer; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @SuppressWarnings("WeakerAccess") @Configuration @@ -51,7 +53,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @EnableJpaRepositories({ "io.mifos.template.service.internal.repository" }) -public class TemplateConfiguration { +public class TemplateConfiguration extends WebMvcConfigurerAdapter { public TemplateConfiguration() { super(); @@ -61,4 +63,9 @@ public class TemplateConfiguration { public Logger logger() { return LoggerFactory.getLogger(ServiceConstants.LOGGER_NAME); } + + @Override + public void configurePathMatch(final PathMatchConfigurer configurer) { +configurer.setUseSuffixPatternMatch(Boolean.FALSE); + } }
[fineract-cn-template] 03/38: Adding example for test
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 8a38bb19f1dad2156cb095821852f29a7b1a3153 Author: myrle-krantz AuthorDate: Tue Apr 4 17:11:41 2017 +0200 Adding example for test --- api/build.gradle | 4 ++ .../mifos/template/api/v1/domain/SampleTest.java | 55 ++ 2 files changed, 59 insertions(+) diff --git a/api/build.gradle b/api/build.gradle index c5b6745..17c6648 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -21,6 +21,10 @@ dependencies { [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator], [group: 'org.hibernate', name: 'hibernate-validator-annotation-processor', version: versions.validator] ) + +testCompile( +[group: 'io.mifos.core', name: 'test', version: versions.frameworktest], +) } publishing { diff --git a/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java b/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java new file mode 100644 index 000..acf33cb --- /dev/null +++ b/api/src/test/java/io/mifos/template/api/v1/domain/SampleTest.java @@ -0,0 +1,55 @@ +/* + * Copyright 2017 The Mifos Initiative. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + *http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.mifos.template.api.v1.domain; + +import io.mifos.core.test.domain.ValidationTest; +import io.mifos.core.test.domain.ValidationTestCase; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.runners.Parameterized; + +import java.util.ArrayList; +import java.util.Collection; + +public class SampleTest extends ValidationTest { + + public SampleTest(ValidationTestCase testCase) { +super(testCase); + } + + @Override + protected Sample createValidTestSubject() { +return Sample.create("", "yyy"); + } + + @Parameterized.Parameters + public static Collection testCases() { +final Collection ret = new ArrayList<>(); +ret.add(new ValidationTestCase("basicCase") +.adjustment(x -> {}) +.valid(true)); +ret.add(new ValidationTestCase("nullIdentifier") +.adjustment(x -> x.setIdentifier(null)) +.valid(false)); +ret.add(new ValidationTestCase("tooShortIdentifier") +.adjustment(x -> x.setIdentifier("z")) +.valid(false)); +ret.add(new ValidationTestCase("tooLongPayload") +.adjustment(x -> x.setPayload(RandomStringUtils.randomAlphanumeric(513))) +.valid(false)); +return ret; + } + +} \ No newline at end of file
[fineract-cn-template] 11/38: Changed initialize payload to the version number as agreed.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 486ae6b52dc351172e7a2c6be4b511914ebb3cb1 Author: Myrle Krantz AuthorDate: Mon Jul 10 12:16:22 2017 +0200 Changed initialize payload to the version number as agreed. --- .../src/main/java/io/mifos/template/SuiteTestEnvironment.java | 4 +++- component-test/src/main/java/io/mifos/template/TestSample.java| 2 +- .../service/internal/command/handler/MigrationAggregate.java | 8 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java index dd5bfd0..923cf79 100644 --- a/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java +++ b/component-test/src/main/java/io/mifos/template/SuiteTestEnvironment.java @@ -30,7 +30,9 @@ import org.junit.rules.TestRule; * initializing and de-initializing external resources. */ public class SuiteTestEnvironment { - static final String APP_NAME = "template-v1"; + static final String APP_VERSION = "1"; + static final String APP_NAME = "template-v" + APP_VERSION; + static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); diff --git a/component-test/src/main/java/io/mifos/template/TestSample.java b/component-test/src/main/java/io/mifos/template/TestSample.java index 924512b..92ae690 100644 --- a/component-test/src/main/java/io/mifos/template/TestSample.java +++ b/component-test/src/main/java/io/mifos/template/TestSample.java @@ -103,7 +103,7 @@ public class TestSample extends SuiteTestEnvironment { public boolean waitForInitialize() { try { - return this.eventRecorder.wait(EventConstants.INITIALIZE, EventConstants.INITIALIZE); + return this.eventRecorder.wait(EventConstants.INITIALIZE, APP_VERSION); } catch (final InterruptedException e) { throw new IllegalStateException(e); } diff --git a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java index 920465a..12ae643 100644 --- a/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java +++ b/service/src/main/java/io/mifos/template/service/internal/command/handler/MigrationAggregate.java @@ -19,6 +19,7 @@ import io.mifos.core.command.annotation.Aggregate; import io.mifos.core.command.annotation.CommandHandler; import io.mifos.core.command.annotation.CommandLogLevel; import io.mifos.core.command.annotation.EventEmitter; +import io.mifos.core.lang.ApplicationName; import io.mifos.core.mariadb.domain.FlywayFactoryBean; import io.mifos.template.api.v1.events.EventConstants; import io.mifos.template.service.ServiceConstants; @@ -39,15 +40,18 @@ public class MigrationAggregate { private final Logger logger; private final DataSource dataSource; private final FlywayFactoryBean flywayFactoryBean; + private final ApplicationName applicationName; @Autowired public MigrationAggregate(@Qualifier(ServiceConstants.LOGGER_NAME) final Logger logger, final DataSource dataSource, -final FlywayFactoryBean flywayFactoryBean) { +final FlywayFactoryBean flywayFactoryBean, +final ApplicationName applicationName) { super(); this.logger = logger; this.dataSource = dataSource; this.flywayFactoryBean = flywayFactoryBean; +this.applicationName = applicationName; } @CommandHandler(logStart = CommandLogLevel.INFO, logFinish = CommandLogLevel.INFO) @@ -56,6 +60,6 @@ public class MigrationAggregate { public String initialize(final InitializeServiceCommand initializeServiceCommand) { this.logger.debug("Start service migration."); this.flywayFactoryBean.create(this.dataSource).migrate(); -return EventConstants.INITIALIZE; +return this.applicationName.getVersionString(); } }
[fineract-cn-template] 38/38: Merge pull request #6 from Izakey/FINCN-120
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-template.git commit 9e47fb42b29ee6e9257bbded56df35025680d329 Merge: d7c232d 666d932 Author: Isaac Kamga AuthorDate: Mon Sep 2 23:39:16 2019 +0100 Merge pull request #6 from Izakey/FINCN-120 Migrate template from MariaDB to PostgreSQL .gitignore| 3 ++- NOTICE.txt| 2 +- .../apache/fineract/cn/template/SuiteTestEnvironment.java | 6 +++--- .../java/org/apache/fineract/cn/template/TestSample.java | 2 +- service/build.gradle | 2 +- .../cn/template/service/TemplateConfiguration.java| 4 ++-- .../internal/command/handler/MigrationAggregate.java | 2 +- service/src/main/resources/application.yml| 15 ++- .../{mariadb => postgresql}/V1__initial_setup.sql | 2 +- shared.gradle | 5 +++-- 10 files changed, 25 insertions(+), 18 deletions(-)
[fineract-cn-demo-server] branch develop updated (af9299e -> c5baf22)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-demo-server.git. from af9299e Merge pull request #29 from aasaru/simplify_running new d99003f Migrate from MariaDB to PostgreSQL, add postgresql-testing-lite script too new a7faae1 Enhance PostgreSQL testing script new b3096af Remove assertions which brake build new 220112f Postgres script to test migration of all services new 53e6410 Update postgres-setup.sh new a3ee2ad Merge pull request #1 from ebenezergraham/patch-1 new 123f993 Fix for Application Provisioning new 1309447 Merge pull request #3 from ebenezergraham/FINCN-141 new c5baf22 Merge pull request #27 from Izakey/FINCN-141 The 138 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 2 + scripts/Unix/eclipselink-test-setup.sh | 171 +++ scripts/Unix/postgres-setup-lite.sh| 136 scripts/Unix/postgres-setup.sh | 216 +++ .../org/apache/fineract/cn/dev/ServiceRunner.java | 235 + .../org/apache/fineract/cn/dev/TenantBuilder.java | 12 +- 6 files changed, 632 insertions(+), 140 deletions(-) create mode 100755 scripts/Unix/eclipselink-test-setup.sh create mode 100755 scripts/Unix/postgres-setup-lite.sh create mode 100755 scripts/Unix/postgres-setup.sh
[fineract-cn-service-starter] branch develop updated: Migrate service-starter from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-service-starter.git The following commit(s) were added to refs/heads/develop by this push: new 84d6607 Migrate service-starter from MariaDB to PostgreSQL new 0bc3b76 Merge pull request #8 from Izakey/FINCN-140 84d6607 is described below commit 84d6607333dd3663c815bb358cafc35075ec9805 Author: Isaac Kamga AuthorDate: Sat Mar 23 01:02:16 2019 +0100 Migrate service-starter from MariaDB to PostgreSQL --- .../test/servicestarter/IntegrationTestEnvironment.java | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/apache/fineract/cn/test/servicestarter/IntegrationTestEnvironment.java b/src/main/java/org/apache/fineract/cn/test/servicestarter/IntegrationTestEnvironment.java index 645aede..04dbe65 100644 --- a/src/main/java/org/apache/fineract/cn/test/servicestarter/IntegrationTestEnvironment.java +++ b/src/main/java/org/apache/fineract/cn/test/servicestarter/IntegrationTestEnvironment.java @@ -77,12 +77,12 @@ public class IntegrationTestEnvironment extends ExternalResource { properties.setProperty(CASSANDRA_CONSISTENCY_LEVEL_READ_PROPERTY, CASSANDRA_CONSISTENCY_LEVEL_DEFAULT); properties.setProperty(CASSANDRA_CONSISTENCY_LEVEL_WRITE_PROPERTY, CASSANDRA_CONSISTENCY_LEVEL_DEFAULT); properties.setProperty(CASSANDRA_CONSISTENCY_LEVEL_DELETE_PROPERTY, CASSANDRA_CONSISTENCY_LEVEL_DEFAULT); -properties.setProperty(MARIADB_DRIVER_CLASS_PROPERTY, MARIADB_DRIVER_CLASS_DEFAULT); -properties.setProperty(MARIADB_DATABASE_NAME_PROPERTY, MARIADB_DATABASE_NAME_DEFAULT); -properties.setProperty(MARIADB_HOST_PROPERTY, MARIADB_HOST_DEFAULT); -properties.setProperty(MARIADB_PORT_PROPERTY, MARIADB_PORT_DEFAULT); -properties.setProperty(MARIADB_USER_PROPERTY, MARIADB_USER_DEFAULT); -properties.setProperty(MARIADB_PASSWORD_PROPERTY, MARIADB_PASSWORD_DEFAULT); +properties.setProperty(POSTGRESQL_DRIVER_CLASS_PROPERTY, POSTGRESQL_DRIVER_CLASS_DEFAULT); +properties.setProperty(POSTGRESQL_DATABASE_NAME_PROPERTY, POSTGRESQL_DATABASE_NAME_DEFAULT); +properties.setProperty(POSTGRESQL_HOST_PROPERTY, POSTGRESQL_HOST_DEFAULT); +properties.setProperty(POSTGRESQL_PORT_PROPERTY, POSTGRESQL_PORT_DEFAULT); +properties.setProperty(POSTGRESQL_USER_PROPERTY, POSTGRESQL_USER_DEFAULT); +properties.setProperty(POSTGRESQL_PASSWORD_PROPERTY, POSTGRESQL_PASSWORD_DEFAULT); properties.setProperty(HYSTRIX_ENABLED_PROPERTY, HYSTRIX_ENABLED_DEFAULT); properties.setProperty(RIBBON_USES_EUREKA_PROPERTY, "true"); this.keyPairHolder = RsaKeyPairFactory.createKeyPair(); @@ -98,7 +98,7 @@ public class IntegrationTestEnvironment extends ExternalResource { this.ports = new HashSet<>(); //Prevent the following ports from being allocated to Microservices. this.ports.add(0); -this.ports.add(3306); //MySQL +this.ports.add(5432); //PostgreSQL this.ports.add(9142); //Cassandra this.ports.add(ActiveMQForTest.PORT); this.ports.add(EurekaForTest.PORT); @@ -171,4 +171,4 @@ public class IntegrationTestEnvironment extends ExternalResource { public AutoUserContext createAutoUserContext(final String userName) { return systemSecurityEnvironment.createAutoUserContext(userName, applicationNames); } -} +} \ No newline at end of file
[fineract-cn-default-setup] 30/30: Merge pull request #8 from Izakey/FINCN-155
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 59669201f0d025c2eaa03dc30badeb12bb039a13 Merge: db525d0 e7f5fe5 Author: Isaac Kamga AuthorDate: Mon Sep 2 23:25:00 2019 +0100 Merge pull request #8 from Izakey/FINCN-155 Prepare default setup for PostgreSQL migration .gitignore| 3 +++ accounting/src/main/resources/standardChartOfAccounts/ledgers.csv | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)
[fineract-cn-default-setup] 23/30: FINCN-148 build with travis-ci.com and upload artifacts to Artifactory
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 5475c42cf21d2c4b7ae68e3eac6f981a3634ae8e Author: Juhan Aasaru AuthorDate: Thu Apr 25 13:16:15 2019 +0300 FINCN-148 build with travis-ci.com and upload artifacts to Artifactory --- .travis.yml | 30 + README.md | 2 +- accounting/build.gradle | 3 ++- build.gradle| 8 +- shared.gradle | 17 travis.sh | 71 + 6 files changed, 128 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..f78ecdb --- /dev/null +++ b/.travis.yml @@ -0,0 +1,30 @@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +language: java +sudo: false +jdk: +- openjdk8 +install: true +script: "./travis.sh" +env: + global: +- BUILD_SNAPSHOTS_BRANCH=develop +- ARTIFACTORY_URL=https://mifos.jfrog.io/mifos +- ARTIFACTORY_USER=travis-ci +- secure: "ccFs6pGBQDhjbc2Dj79fjH2qemX3f3OUITFpVPTiJjacl8kN/lsUG/popLLsjqLXQo0LYPbo+pDT5lb4DUIyZ9hyTqyKgv3gPnbiiQLiUPa7f73/+978mtC9x6Cgkxxd1v25FPMO1y4jnhSB+NfGdVhAz7Ymp+W1AcKs6pNv5pblP2JCmwQF+brtkqtuwa8qKoMxLenl0a91+x8pb2jfGX5Ti+7R5NJA9ofRifJHv5NraLS2hjdY5DYEBFCTPxrGS/YFhpceyeH4quNYNPwzLjmNKQhhPldQYZBpHZc5SzTBxdHyb6f4ojRXE0cVg0hX8O4N2M9jpXgh0d/TJ3ljbUAAZ7gmUj2B6wNhvK6pjp+ErMX10RHOMbwCRZASqc/5sK/IosIYCk55H8TKtWmJ7BEhQ/FAcdxcpOZcJsnqy2QLVAnOvemrVr1CjyAyVFg6oMpvrWTru54zmVgWR5VOmlZyRPbpy [...] diff --git a/README.md b/README.md index 797cd82..1df5cae 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Apache Fineract CN default setup +# Apache Fineract CN default setup [![Build Status](https://api.travis-ci.com/apache/fineract-cn-default-setup.svg?branch=develop)](https://travis-ci.com/apache/fineract-cn-default-setup) This project provides resources which can be used to create a default setup for microservices in [Apache Fineract CN](https://github.com/search?q=org%3Aapache+fineract) deployment. It is dependent on the apis and importers of those microservices. diff --git a/accounting/build.gradle b/accounting/build.gradle index 750b592..35c385d 100644 --- a/accounting/build.gradle +++ b/accounting/build.gradle @@ -32,6 +32,7 @@ buildscript { plugins { id "com.github.hierynomus.license" version "0.13.1" id("org.nosphere.apache.rat") version "0.3.1" +id "com.jfrog.artifactory" version "4.9.5" } apply from: '../shared.gradle' @@ -49,7 +50,7 @@ publishing { from components.java groupId project.group artifactId project.name -version project.version +version project.findProperty('externalVersion') ?: project.version } } } diff --git a/build.gradle b/build.gradle index 181d7d7..7c138e7 100644 --- a/build.gradle +++ b/build.gradle @@ -26,6 +26,12 @@ task publishToMavenLocal { dependsOn publishAccountingToMavenLocal } +task artifactoryPublish { +group 'all' +dependsOn publishToMavenLocal +dependsOn gradle.includedBuild('accounting').task(':artifactoryPublish') +} + task licenseFormat { group 'all' dependsOn gradle.includedBuild('accounting').task(':licenseFormat') @@ -34,4 +40,4 @@ task licenseFormat { task rat { group 'all' dependsOn gradle.includedBuild('accounting').task(':rat') -} \ No newline at end of file +} diff --git a/shared.gradle b/shared.gradle index 7a56e4c..c8602f3 100644 --- a/shared.gradle +++ b/shared.gradle @@ -36,6 +36,7 @@ tasks.withType(JavaCompile) { repositories { jcenter() mavenLocal() +maven { url 'https://mifos.jfrog.io/mifos/libs-snapshot/' } } dependencyManagement { @@ -61,6 +62,22 @@ jar { duplicatesStrategy = DuplicatesStrategy.EXCLUDE } +artifactory { +contextUrl = System.getenv("ARTIFACTORY_URL") +publish { +repository { +repoKey = project.findProperty('artifactoryRepoKey') +username = System.getenv("A
[fineract-cn-default-setup] 22/30: Merge pull request #6 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 98774b17c588029901c3e012c3c4382ff457462a Merge: 052fbf1 a7b380c Author: Myrle Krantz AuthorDate: Mon Apr 16 21:22:39 2018 +0200 Merge pull request #6 from myrle-krantz/develop Updating package names. README.md | 2 -- .../apache/fineract/cn}/ImportTest.java| 37 +++--- 2 files changed, 18 insertions(+), 21 deletions(-)
[fineract-cn-default-setup] 21/30: Removing last warnings.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit a7b380ca34c493ff202edab1ace85cd3ebae0e60 Author: Myrle Krantz AuthorDate: Mon Apr 16 15:21:01 2018 +0200 Removing last warnings. --- accounting/src/test/java/org/apache/fineract/cn/ImportTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accounting/src/test/java/org/apache/fineract/cn/ImportTest.java b/accounting/src/test/java/org/apache/fineract/cn/ImportTest.java index cfae09e..fc86aa1 100644 --- a/accounting/src/test/java/org/apache/fineract/cn/ImportTest.java +++ b/accounting/src/test/java/org/apache/fineract/cn/ImportTest.java @@ -86,7 +86,7 @@ public class ImportTest { } @Override -public Void answer(InvocationOnMock invocation) throws Throwable { +public Void answer(InvocationOnMock invocation) { final Ledger ledger = invocation.getArgumentAt(indexOfLedger, Ledger.class); final ValidatorFactory factory = Validation.buildDefaultValidatorFactory(); @@ -102,7 +102,7 @@ public class ImportTest { class ReturnLedgers implements Answer { @Override -public Ledger answer(InvocationOnMock invocation) throws Throwable { +public Ledger answer(InvocationOnMock invocation) { final String ledgerIdentifier = invocation.getArgumentAt(0, String.class); return createdLedgers.get(ledgerIdentifier); } @@ -118,7 +118,7 @@ public class ImportTest { } @Override -public Void answer(InvocationOnMock invocation) throws Throwable { +public Void answer(InvocationOnMock invocation) { final T thingy = invocation.getArgumentAt(indexOfArgument, thingyClass); final ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
[fineract-cn-default-setup] 27/30: Merge pull request #9 from ebenezergraham/FINCN-157
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit db525d09c4e93305948b049a54015a90504932b0 Merge: 667d090 5c2075d Author: Awasum Yannick AuthorDate: Mon Jun 3 20:45:44 2019 +0100 Merge pull request #9 from ebenezergraham/FINCN-157 Adding rat report to After Failure procedure .travis.yml | 3 +++ shared.gradle | 1 + 2 files changed, 4 insertions(+)
[fineract-cn-default-setup] 18/30: Adjusting to package name changes in upstream repositories.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 6714accb3f54a18f7910c1ab99915cecc4db327f Author: Myrle Krantz AuthorDate: Mon Apr 16 15:16:01 2018 +0200 Adjusting to package name changes in upstream repositories. --- accounting/src/test/java/io/mifos/ImportTest.java | 29 +++ 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/accounting/src/test/java/io/mifos/ImportTest.java b/accounting/src/test/java/io/mifos/ImportTest.java index f6a1a06..ea58f6c 100644 --- a/accounting/src/test/java/io/mifos/ImportTest.java +++ b/accounting/src/test/java/io/mifos/ImportTest.java @@ -18,11 +18,20 @@ */ package io.mifos; -import io.mifos.accounting.api.v1.client.LedgerManager; -import io.mifos.accounting.api.v1.domain.Account; -import io.mifos.accounting.api.v1.domain.Ledger; -import io.mifos.accounting.importer.AccountImporter; -import io.mifos.accounting.importer.LedgerImporter; +import java.io.IOException; +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; +import javax.validation.ConstraintViolation; +import javax.validation.Validation; +import javax.validation.Validator; +import javax.validation.ValidatorFactory; +import org.apache.fineract.cn.accounting.api.v1.client.LedgerManager; +import org.apache.fineract.cn.accounting.api.v1.domain.Account; +import org.apache.fineract.cn.accounting.api.v1.domain.Ledger; +import org.apache.fineract.cn.accounting.importer.AccountImporter; +import org.apache.fineract.cn.accounting.importer.LedgerImporter; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -35,16 +44,6 @@ import org.slf4j.Logger; import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.test.context.junit4.SpringRunner; -import javax.validation.ConstraintViolation; -import javax.validation.Validation; -import javax.validation.Validator; -import javax.validation.ValidatorFactory; -import java.io.IOException; -import java.net.URL; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - /** * @author Myrle Krantz */
[fineract-cn-default-setup] 24/30: Merge pull request #7 from aasaru/artifactory
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 667d09013635a947e27bebcac3407ff624be6cc0 Merge: 98774b1 5475c42 Author: Awasum Yannick AuthorDate: Tue Apr 30 09:19:49 2019 +0100 Merge pull request #7 from aasaru/artifactory FINCN-148 build with travis-ci.com and upload artifacts to Artifactory .travis.yml | 30 + README.md | 2 +- accounting/build.gradle | 3 ++- build.gradle| 8 +- shared.gradle | 17 travis.sh | 71 + 6 files changed, 128 insertions(+), 3 deletions(-)
[fineract-cn-default-setup] 25/30: Prepare default setup for PostgreSQL migration
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 480f888960537bc250701c22419cbf58e0c3ab01 Author: Isaac Kamga AuthorDate: Thu May 9 04:51:51 2019 +0100 Prepare default setup for PostgreSQL migration --- .../resources/standardChartOfAccounts/ledgers.csv| 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/accounting/src/main/resources/standardChartOfAccounts/ledgers.csv b/accounting/src/main/resources/standardChartOfAccounts/ledgers.csv index bc27958..f0b33f0 100644 --- a/accounting/src/main/resources/standardChartOfAccounts/ledgers.csv +++ b/accounting/src/main/resources/standardChartOfAccounts/ledgers.csv @@ -1,13 +1,13 @@ -parentIdentifier,identifier,description,type,show -,1000,"Income",REVENUE,true +parentIdentifier,identifier,description,type,show, +1000,"Income",REVENUE,true 1000,1100,"Income from Loans",REVENUE,true 1000,1200,"Investment Income",REVENUE,true 1000,1300,"Fees and Charges",REVENUE,true 1000,1400,"Gain (Loss) on Sale of Loans",REVENUE,true 1000,1500,"Miscellaneouse Income",REVENUE,true 1000,1600,"Service Income on Loans",REVENUE,true -1000,1700,"Trading Profits & Losses",REVENUE,true -,2000,"Expenses",EXPENSE,true +1000,1700,"Trading Profits & Losses",REVENUE,true, +2000,"Expenses",EXPENSE,true 2000,2100,"Employee Compensation",EXPENSE,true 2000,2200,"Employee Benefits",EXPENSE,true 2000,2300,"Travel and Conference Expenses",EXPENSE,true @@ -24,8 +24,8 @@ parentIdentifier,identifier,description,type,show 2000,3400,"Interest on Borrowed Money",EXPENSE,true 2000,3550,"Annual Meeting Expenses",EXPENSE,true 2000,3700,"Miscellaneous Operating Expenses",EXPENSE,true -2000,3800,"Interest (Dividend) Expense",EXPENSE,true -,7000,"Assets",ASSET,true +2000,3800,"Interest (Dividend) Expense",EXPENSE,true, +7000,"Assets",ASSET,true 7000,7010,"Loans to Members",ASSET,true 7000,7020,"Lines of Credit to Members",ASSET,true 7000,7030,"Real Estate Loans",ASSET,true @@ -41,13 +41,13 @@ parentIdentifier,identifier,description,type,show 7000,7600,"Prepaid Expenses and Deferred Charges",ASSET,true 7000,7700,"Fixed Assets",ASSET,true 7000,7800,"Accrued Income",ASSET,true -7000,7900,"Other Assets",ASSET,true -,8000,"Accounts Payable",LIABILITY,true +7000,7900,"Other Assets",ASSET,true, +8000,"Accounts Payable",LIABILITY,true 8000,8100,"Accounts Payable",LIABILITY,true 8000,8200,"Interest Payable",LIABILITY,true 8000,8400,"Taxes Payable",LIABILITY,true -8000,8500,"Accrued Expenses",LIABILITY,true -,9000,"Equity",EQUITY,true +8000,8500,"Accrued Expenses",LIABILITY,true, +9000,"Equity",EQUITY,true 9000,9100,"Member Savings",EQUITY,true 9000,9300,"Reserves",EQUITY,true 9000,9400,"Undivided Earnings",EQUITY,true
[fineract-cn-default-setup] 29/30: Merge pull request #1 from ebenezergraham/FINCN-155
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit e7f5fe56d907ce0f8a407c9ce0d74e551174345e Merge: 480f888 1fbcf26 Author: Isaac Kamga AuthorDate: Sun Aug 25 17:51:54 2019 +0100 Merge pull request #1 from ebenezergraham/FINCN-155 Fix for CSV bug .gitignore | 3 +++ .../resources/standardChartOfAccounts/ledgers.csv| 20 ++-- 2 files changed, 13 insertions(+), 10 deletions(-)
[fineract-cn-default-setup] 07/30: updating artifact ids to apache fineract from mifos io
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 7b16f8da723ecc2f2c69e566d113ad2b214adf58 Author: Myrle Krantz AuthorDate: Mon Feb 26 17:52:45 2018 +0100 updating artifact ids to apache fineract from mifos io --- accounting/build.gradle | 2 +- build.gradle| 2 +- shared.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/accounting/build.gradle b/accounting/build.gradle index 43ee376..f3a5381 100644 --- a/accounting/build.gradle +++ b/accounting/build.gradle @@ -21,7 +21,7 @@ apply from: '../shared.gradle' dependencies { testCompile( [group: 'org.hibernate', name: 'hibernate-validator', version: versions.validator], -[group: 'io.mifos.accounting', name: 'importer', version: versions.accounting], +[group: 'org.apache.fineract.cn.accounting', name: 'importer', version: versions.accounting], ) } diff --git a/build.gradle b/build.gradle index 8050379..2c9398c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,4 @@ -group 'io.mifos' +group 'org.apache.fineract.cn' task publishAccountingToMavenLocal { dependsOn gradle.includedBuild('accounting').task(':publishToMavenLocal') diff --git a/shared.gradle b/shared.gradle index ec86251..eeccbf4 100644 --- a/shared.gradle +++ b/shared.gradle @@ -1,4 +1,4 @@ -group 'io.mifos.default-setup' +group 'org.apache.fineract.cn.default-setup' version '0.1.0-BUILD-SNAPSHOT' ext.versions = [
[fineract-cn-default-setup] 19/30: Change package names from mifos to apache fineract.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 5b48c9b40c5635630d3a43b58af21d85685fe0e0 Author: Myrle Krantz AuthorDate: Mon Apr 16 15:19:35 2018 +0200 Change package names from mifos to apache fineract. --- .../src/test/java/{io/mifos => org/apache/fineract/cn}/ImportTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/accounting/src/test/java/io/mifos/ImportTest.java b/accounting/src/test/java/org/apache/fineract/cn/ImportTest.java similarity index 99% rename from accounting/src/test/java/io/mifos/ImportTest.java rename to accounting/src/test/java/org/apache/fineract/cn/ImportTest.java index ea58f6c..cfae09e 100644 --- a/accounting/src/test/java/io/mifos/ImportTest.java +++ b/accounting/src/test/java/org/apache/fineract/cn/ImportTest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos; +package org.apache.fineract.cn; import java.io.IOException; import java.net.URL;
[fineract-cn-default-setup] 13/30: Merge pull request #3 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 64f781ec83a102aa7a19fa5dc1f9ad38b86abe7b Merge: 847d821 33d71ad Author: Myrle Krantz AuthorDate: Wed Apr 4 17:42:14 2018 +0200 Merge pull request #3 from myrle-krantz/develop saving pull request from mifosio repo accounting/src/main/resources/standardChartOfAccounts/accounts.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[fineract-cn-default-setup] 12/30: Merge commit 'refs/pull/3/head' of https://github.com/mifosio/default-setup into fixed-duplicate-account
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 33d71ad46ac35d89ea58276f503c2dc8c0d0f197 Merge: 847d821 2b6a03f Author: Myrle Krantz AuthorDate: Wed Apr 4 17:38:08 2018 +0200 Merge commit 'refs/pull/3/head' of https://github.com/mifosio/default-setup into fixed-duplicate-account accounting/src/main/resources/standardChartOfAccounts/accounts.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[fineract-cn-default-setup] 01/30: Initial commit.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 5b9adaabd786ee26f18ab223dff46e3aacb87420 Author: Myrle Krantz AuthorDate: Fri Aug 4 17:35:26 2017 +0200 Initial commit. --- .gitignore | 16 ++ HEADER | 13 ++ LICENSE| 201 + README.md | 38 accounting/build.gradle| 37 accounting/settings.gradle | 1 + .../resources/standardChartOfAccounts/accounts.csv | 79 .../resources/standardChartOfAccounts/ledgers.csv | 53 ++ accounting/src/test/java/io/mifos/ImportTest.java | 131 ++ build.gradle | 15 ++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54212 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew| 172 ++ gradlew.bat| 84 + settings.gradle| 4 + shared.gradle | 58 ++ 16 files changed, 908 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..f9d7cba --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +.gradle +.idea +build/ +target/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar + +*.iml + +*.log + +*.toDelete diff --git a/HEADER b/HEADER new file mode 100644 index 000..4b2eadf --- /dev/null +++ b/HEADER @@ -0,0 +1,13 @@ +Copyright ${year} ${name}. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..8dada3e --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain
[fineract-cn-default-setup] 09/30: Updated copyright information on default setup
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 694ab3b38edbb85c9bd1dc041e8cffc0b58697da Author: Isaac Kamga AuthorDate: Fri Mar 2 22:37:01 2018 +0100 Updated copyright information on default setup --- HEADER| 25 +-- NOTICE.txt| 5 + README.md | 4 ++-- accounting/src/test/java/io/mifos/ImportTest.java | 25 +-- shared.gradle | 2 +- 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/HEADER b/HEADER index 4b2eadf..90705e0 100644 --- a/HEADER +++ b/HEADER @@ -1,13 +1,16 @@ -Copyright ${year} ${name}. +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. \ No newline at end of file +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. \ No newline at end of file diff --git a/NOTICE.txt b/NOTICE.txt new file mode 100644 index 000..42727c2 --- /dev/null +++ b/NOTICE.txt @@ -0,0 +1,5 @@ +Apache Fineract CN Default Setup +Copyright [2017-2018] The Apache Software Foundation + +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/README.md b/README.md index 5e13ef5..f0b4351 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Mifos I/O default setup +# Apache Fineract CN default setup [![Join the chat at https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge_medium=badge_campaign=pr-badge_content=badge) This project provides resources which can be used to create a default setup for microservices in a Mifos I/O deployment. It is dependent on the apis and importers of those microservices. ## Abstract -Mifos I/O is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world. +Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world. ## Steps needed to create a default setup for a new microservice diff --git a/accounting/src/test/java/io/mifos/ImportTest.java b/accounting/src/test/java/io/mifos/ImportTest.java index 8abc162..f6a1a06 100644 --- a/accounting/src/test/java/io/mifos/ImportTest.java +++ b/accounting/src/test/java/io/mifos/ImportTest.java @@ -1,17 +1,20 @@ /* - * Copyright 2017 The Mifos Initiative. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 * - *http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * dist
[fineract-cn-default-setup] 08/30: Merge pull request #1 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 2efcb2250821f3f0aeac884ea46728c972d6d779 Merge: 109e641 7b16f8d Author: Myrle Krantz AuthorDate: Mon Feb 26 18:29:49 2018 +0100 Merge pull request #1 from myrle-krantz/develop updating artifact ids to apache fineract from mifos io accounting/build.gradle | 2 +- build.gradle| 2 +- shared.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
[fineract-cn-default-setup] 11/30: Merge pull request #2 from Izakey/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 847d82156ac55540a7e0641a4676a3d15458f844 Merge: 2efcb22 74cc780 Author: Myrle Krantz AuthorDate: Fri Mar 16 11:57:47 2018 +0100 Merge pull request #2 from Izakey/develop Updated copyright information on default setup HEADER| 25 +-- NOTICE.txt| 5 + README.md | 4 ++-- accounting/src/test/java/io/mifos/ImportTest.java | 25 +-- shared.gradle | 2 -- 5 files changed, 35 insertions(+), 26 deletions(-)
[fineract-cn-default-setup] 05/30: Merge pull request #2 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 109e641787d06edad3d8147fcee8af86f6a1eb0b Merge: 94d91c5 dcea7e1 Author: Myrle Krantz AuthorDate: Wed Aug 9 10:58:50 2017 +0200 Merge pull request #2 from myrle-krantz/develop Fixed non-unique account. accounting/src/main/resources/standardChartOfAccounts/accounts.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[fineract-cn-default-setup] 20/30: Removing last references to mifos.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit efa7c78903e35a1d7f4c55fcb67d3fa50898ac30 Author: Myrle Krantz AuthorDate: Mon Apr 16 15:20:45 2018 +0200 Removing last references to mifos. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 2936b1a..797cd82 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Apache Fineract CN default setup -[![Join the chat at https://gitter.im/mifos-initiative/mifos.io](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/mifos-initiative/mifos.io?utm_source=badge_medium=badge_campaign=pr-badge_content=badge) - This project provides resources which can be used to create a default setup for microservices in [Apache Fineract CN](https://github.com/search?q=org%3Aapache+fineract) deployment. It is dependent on the apis and importers of those microservices. ## Abstract
[fineract-cn-default-setup] 10/30: Removed unused year and name variables
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 74cc78086f3986a923791799c8786c2bc29ca51d Author: Isaac Kamga AuthorDate: Mon Mar 5 21:26:09 2018 +0100 Removed unused year and name variables --- shared.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/shared.gradle b/shared.gradle index d8df78b..ade8599 100644 --- a/shared.gradle +++ b/shared.gradle @@ -53,6 +53,4 @@ license { yml = 'SCRIPT_STYLE' yaml = 'SCRIPT_STYLE' } -ext.year = Calendar.getInstance().get(Calendar.YEAR) -ext.name = 'The Apache Software Foundation' }
[fineract-cn-default-setup] 03/30: Merge pull request #1 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 94d91c544af9799baff5f9c3b610738d9c702168 Merge: 5b9adaa ca3a471 Author: Myrle Krantz AuthorDate: Wed Aug 9 08:08:32 2017 +0200 Merge pull request #1 from myrle-krantz/develop Changes to chart of accounts as discussed with Dayna. .../src/main/resources/standardChartOfAccounts/accounts.csv| 10 -- .../src/main/resources/standardChartOfAccounts/ledgers.csv | 6 -- 2 files changed, 12 insertions(+), 4 deletions(-)
[fineract-cn-default-setup] 17/30: Merge pull request #5 from myrle-krantz/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 052fbf1ed240c711325257a121087919f3eb3a69 Merge: d1f38ad 194cdd0 Author: Myrle Krantz AuthorDate: Mon Apr 9 21:03:33 2018 +0200 Merge pull request #5 from myrle-krantz/develop Adding rat checks. accounting/build.gradle| 18 ++ accounting/settings.gradle | 17 + build.gradle | 22 ++ settings.gradle| 17 + shared.gradle | 31 +++ 5 files changed, 105 insertions(+)
[fineract-cn-default-setup] 06/30: fixed duplicate account
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 2b6a03f2dcfcf6d83e86c1bcdd2edcc99e6de04f Author: isaac AuthorDate: Sun Dec 24 02:46:59 2017 +0700 fixed duplicate account --- accounting/src/main/resources/standardChartOfAccounts/accounts.csv | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/accounting/src/main/resources/standardChartOfAccounts/accounts.csv b/accounting/src/main/resources/standardChartOfAccounts/accounts.csv index e76b8b5..1c52021 100644 --- a/accounting/src/main/resources/standardChartOfAccounts/accounts.csv +++ b/accounting/src/main/resources/standardChartOfAccounts/accounts.csv @@ -54,7 +54,7 @@ parentIdentifier,identifier,name 7310,7310.1,"Bank account one general" 7310,7310.2,"Bank account one Pending Disbursal" 7310,7311.1,"Bank account two general" -7310,7310.2,"Bank account two Pending Disbursal" +7310,7311.2,"Bank account two Pending Disbursal" 7300,7312,"Petty Cash" 7300,7351,"Vault Cash" 7300,7352,"Teller One" @@ -82,4 +82,4 @@ parentIdentifier,identifier,name 9000,9040,"Other Savings" 9300,9310,"Regular Reserves" 9300,9320,"Special Reserve for Losses" -9300,9330,"Other Reserves" \ No newline at end of file +9300,9330,"Other Reserves"
[fineract-cn-default-setup] branch develop updated (db525d0 -> 5966920)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git. from db525d0 Merge pull request #9 from ebenezergraham/FINCN-157 new 480f888 Prepare default setup for PostgreSQL migration new 1fbcf26 Ignored out directory and Fixed CSV bug new e7f5fe5 Merge pull request #1 from ebenezergraham/FINCN-155 new 5966920 Merge pull request #8 from Izakey/FINCN-155 The 30 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore| 3 +++ accounting/src/main/resources/standardChartOfAccounts/ledgers.csv | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)
[fineract-cn-default-setup] 16/30: Adding rat checks.
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-default-setup.git commit 194cdd072950cb6a5e7f038344d042461b31ac59 Author: Myrle Krantz AuthorDate: Mon Apr 9 21:02:29 2018 +0200 Adding rat checks. --- accounting/build.gradle| 18 ++ accounting/settings.gradle | 17 + build.gradle | 22 ++ settings.gradle| 17 + shared.gradle | 31 +++ 5 files changed, 105 insertions(+) diff --git a/accounting/build.gradle b/accounting/build.gradle index f3a5381..750b592 100644 --- a/accounting/build.gradle +++ b/accounting/build.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + buildscript { ext { springBootVersion = '1.4.1.RELEASE' @@ -14,6 +31,7 @@ buildscript { plugins { id "com.github.hierynomus.license" version "0.13.1" +id("org.nosphere.apache.rat") version "0.3.1" } apply from: '../shared.gradle' diff --git a/accounting/settings.gradle b/accounting/settings.gradle index 7b83788..d96e446 100644 --- a/accounting/settings.gradle +++ b/accounting/settings.gradle @@ -1 +1,18 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + rootProject.name = 'accounting' diff --git a/build.gradle b/build.gradle index 2c9398c..181d7d7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + group 'org.apache.fineract.cn' task publishAccountingToMavenLocal { @@ -13,3 +30,8 @@ task licenseFormat { group 'all' dependsOn gradle.includedBuild('accounting').task(':licenseFormat') } + +task rat { +group 'all' +dependsOn gradle.includedBuild('accounting').task(':rat') +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index bb59698..a23af42 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in
[fineract-cn-teller] branch develop updated: Migrate teller service from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-teller.git The following commit(s) were added to refs/heads/develop by this push: new 7a5caee Migrate teller service from MariaDB to PostgreSQL new 0b48c64 Merge pull request #12 from Izakey/FINCN-126 7a5caee is described below commit 7a5caee61512f1d127e866aab10151796fd174e9 Author: Isaac Kamga AuthorDate: Thu May 9 03:41:12 2019 +0100 Migrate teller service from MariaDB to PostgreSQL --- NOTICE.txt| 2 +- .../org/apache/fineract/cn/teller/AbstractTellerTest.java | 2 +- .../apache/fineract/cn/teller/SuiteTestEnvironment.java | 6 +++--- service/build.gradle | 2 +- .../apache/fineract/cn/teller/TellerConfiguration.java| 4 ++-- .../internal/command/handler/MigrationAggregate.java | 2 +- .../internal/repository/TellerDenominationEntity.java | 2 +- .../teller/service/internal/repository/TellerEntity.java | 2 +- .../internal/repository/TellerTransactionEntity.java | 2 +- service/src/main/resources/application.yml| 15 ++- .../{mariadb => postgresql}/V1__initial_setup.sql | 14 ++ .../{mariadb => postgresql}/V2__add_cheques.sql | 5 ++--- .../V3__add_cheques_receivable_to_teller.sql | 10 -- .../V4__add_last_opened_to_teller.sql | 8 +--- .../V5__add_teller_denomination.sql | 7 +++ shared.gradle | 5 +++-- 16 files changed, 41 insertions(+), 47 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 69a4222..b473f51 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Fineract CN Teller -Copyright [2017-2018] The Apache Software Foundation +Copyright [2017-2019] The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java b/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java index 0ca44cd..02b6d01 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/teller/AbstractTellerTest.java @@ -80,7 +80,7 @@ public class AbstractTellerTest extends SuiteTestEnvironment { static final String TEST_USER = "homer"; @ClassRule - public static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, mariaDBInitializer); + public static TenantDataStoreContextTestRule tenantDataStoreContext = TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, postgreSQLInitializer); @Rule public final TenantApplicationSecurityEnvironmentTestRule tenantApplicationSecurityEnvironment diff --git a/component-test/src/main/java/org/apache/fineract/cn/teller/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/teller/SuiteTestEnvironment.java index 60a8e4f..84d141f 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/teller/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/teller/SuiteTestEnvironment.java @@ -20,7 +20,7 @@ package org.apache.fineract.cn.teller; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.RunExternalResourceOnce; @@ -33,11 +33,11 @@ public class SuiteTestEnvironment { static final String APP_NAME = "teller-v1"; static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); - static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); + static final PostgreSQLInitializer postgreSQLInitializer = new PostgreSQLInitializer(); @ClassRule public static TestRule orderClassRules = RuleChain .outerRule(new RunExternalResourceOnce(testEnvironment)) .around(new RunExternalResourceOnce(cassandraInitializer)) - .around(new RunExternalResourceOnce(mariaDBInitializer)); + .around(new RunExternalResourceOnce(postgreSQLInitializer)); } diff --git a/service/build.gradle b/service/build.gradle index 9a8f00c..6d59312 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -59,7 +59,7 @@ dependencies { [grou
[fineract-cn-payroll] branch develop updated: Migrate payroll service from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-payroll.git The following commit(s) were added to refs/heads/develop by this push: new 3527df3 Migrate payroll service from MariaDB to PostgreSQL new d6b0c9a Merge pull request #9 from Izakey/FINCN-123 3527df3 is described below commit 3527df3a8bf4d2c09c0f4a579480e2ad9de16cdc Author: Isaac Kamga AuthorDate: Thu May 9 04:10:45 2019 +0100 Migrate payroll service from MariaDB to PostgreSQL --- NOTICE.txt| 2 +- .../apache/fineract/cn/payroll/AbstractPayrollTest.java | 4 +--- .../apache/fineract/cn/payroll/SuiteTestEnvironment.java | 6 +++--- service/build.gradle | 2 +- .../cn/payroll/service/PayrollServiceConfiguration.java | 4 ++-- .../internal/command/handler/MigrationAggregate.java | 2 +- .../internal/repository/PayrollCollectionEntity.java | 2 +- .../internal/repository/PayrollConfigurationEntity.java | 2 +- service/src/main/resources/application.yml| 15 ++- .../{mariadb => postgresql}/V1__initial_setup.sql | 8 .../V2__add_distribution_processing_behavior.sql | 0 shared.gradle | 5 +++-- 12 files changed, 28 insertions(+), 24 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index acc95e4..94bb876 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Fineract CN Payroll -Copyright [2017-2018] The Apache Software Foundation +Copyright [2017-2019] The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java index 2030b48..7aa71fd 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/AbstractPayrollTest.java @@ -18,7 +18,6 @@ */ package org.apache.fineract.cn.payroll; - import org.apache.fineract.cn.payroll.api.v1.EventConstants; import org.apache.fineract.cn.payroll.api.v1.client.PayrollManager; import org.apache.fineract.cn.payroll.service.PayrollServiceConfiguration; @@ -74,8 +73,7 @@ public class AbstractPayrollTest extends SuiteTestEnvironment { @ClassRule public final static TenantDataStoreContextTestRule tenantDataStoreContext = - TenantDataStoreContextTestRule.forRandomTenantName(SuiteTestEnvironment.cassandraInitializer, - SuiteTestEnvironment.mariaDBInitializer); + TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, postgreSQLInitializer); @Rule public final TenantApplicationSecurityEnvironmentTestRule tenantApplicationSecurityEnvironment diff --git a/component-test/src/main/java/org/apache/fineract/cn/payroll/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/payroll/SuiteTestEnvironment.java index ebe1880..9f74c01 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/payroll/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/payroll/SuiteTestEnvironment.java @@ -20,7 +20,7 @@ package org.apache.fineract.cn.payroll; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.RunExternalResourceOnce; @@ -38,11 +38,11 @@ public class SuiteTestEnvironment { static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); - static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); + static final PostgreSQLInitializer postgreSQLInitializer = new PostgreSQLInitializer(); @ClassRule public static TestRule orderClassRules = RuleChain .outerRule(new RunExternalResourceOnce(testEnvironment)) .around(new RunExternalResourceOnce(cassandraInitializer)) - .around(new RunExternalResourceOnce(mariaDBInitializer)); + .around(new RunExternalResourceOnce(postgreSQLInitializer)); } diff --git a/service/build.gradle b/service/build.gradle index b7d4e95..abbd0cd 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -56,7 +56,7 @@ dependencies { [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], [group: 'org.apache.fineract
[fineract-cn-cheques] branch develop updated: Migrate cheques service from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-cheques.git The following commit(s) were added to refs/heads/develop by this push: new 81b31cc Migrate cheques service from MariaDB to PostgreSQL new f3ff12d Merge pull request #6 from Izakey/FINCN-125 81b31cc is described below commit 81b31ccc4825e9082874e4eb3efce08dad8babaf Author: Isaac Kamga AuthorDate: Thu May 9 04:01:58 2019 +0100 Migrate cheques service from MariaDB to PostgreSQL --- NOTICE.txt | 2 +- .../fineract/cn/cheque/AbstractChequeTest.java | 2 +- .../fineract/cn/cheque/SuiteTestEnvironment.java | 6 ++--- service/build.gradle | 2 +- .../cn/cheque/service/ChequeConfiguration.java | 4 +-- .../command/handler/ManagementAggregate.java | 2 +- .../service/internal/repository/ChequeEntity.java | 2 +- .../internal/repository/IssuedChequeEntity.java| 2 +- service/src/main/resources/application.yml | 15 +++ .../{mariadb => postgresql}/V1__initial_setup.sql | 10 +++- shared.gradle | 29 +++--- 11 files changed, 40 insertions(+), 36 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index de5aeca..4bc39ba 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Fineract CN Cheques -Copyright [2017-2018] The Apache Software Foundation +Copyright [2017-2019] The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java b/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java index e45a167..61c0aa9 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/cheque/AbstractChequeTest.java @@ -56,7 +56,7 @@ public abstract class AbstractChequeTest extends SuiteTestEnvironment { @ClassRule public final static TenantDataStoreContextTestRule tenantDataStoreContext = - TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, mariaDBInitializer); + TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, postgreSQLInitializer); @Rule public final TenantApplicationSecurityEnvironmentTestRule tenantApplicationSecurityEnvironment diff --git a/component-test/src/main/java/org/apache/fineract/cn/cheque/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/cheque/SuiteTestEnvironment.java index c2b5fb4..39834d9 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/cheque/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/cheque/SuiteTestEnvironment.java @@ -21,7 +21,7 @@ package org.apache.fineract.cn.cheque; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.RunExternalResourceOnce; @@ -34,11 +34,11 @@ public class SuiteTestEnvironment { static final String APP_NAME = "cheques-v1"; static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); - static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); + static final PostgreSQLInitializer postgreSQLInitializer = new PostgreSQLInitializer(); @ClassRule public static TestRule orderClassRules = RuleChain .outerRule(new RunExternalResourceOnce(testEnvironment)) .around(new RunExternalResourceOnce(cassandraInitializer)) - .around(new RunExternalResourceOnce(mariaDBInitializer)); + .around(new RunExternalResourceOnce(postgreSQLInitializer)); } diff --git a/service/build.gradle b/service/build.gradle index 01bcfea..cc63a59 100644 --- a/service/build.gradle +++ b/service/build.gradle @@ -58,7 +58,7 @@ dependencies { [group: 'org.apache.fineract.cn', name: 'lang', version: versions.frameworklang], [group: 'org.apache.fineract.cn', name: 'async', version: versions.frameworkasync], [group: 'org.apache.fineract.cn', name: 'cassandra', version: versions.frameworkcassandra], -[group: 'org.apache.fineract.cn', name: 'mariadb', version: versions.frameworkmariadb], +[group: 'org.apache.fineract.cn', name: 'postgresql', version: versions.frameworkpostgresql], [group: 'org.apach
[fineract-cn-group] branch develop updated: Migrate group service from MariaDB to PostgreSQL
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-group.git The following commit(s) were added to refs/heads/develop by this push: new e49c4cb Migrate group service from MariaDB to PostgreSQL new 62100a4 Merge pull request #11 from Izakey/FINCN-118 e49c4cb is described below commit e49c4cb560d0a0ade770dea6700e599c8e9dc6e0 Author: Isaac Kamga AuthorDate: Thu May 9 04:17:51 2019 +0100 Migrate group service from MariaDB to PostgreSQL --- NOTICE.txt| 2 +- .../apache/fineract/cn/group/SuiteTestEnvironment.java| 8 .../main/java/org/apache/fineract/cn/group/TestGroup.java | 2 +- .../org/apache/fineract/cn/group/TestGroupDefinition.java | 2 +- service/build.gradle | 3 ++- .../org/apache/fineract/cn/group/GroupConfiguration.java | 4 ++-- .../internal/command/handler/MigrationAggregate.java | 2 +- .../cn/group/internal/repository/GroupCommandEntity.java | 2 +- .../group/internal/repository/GroupDefinitionEntity.java | 2 +- .../cn/group/internal/repository/GroupEntity.java | 2 +- .../cn/group/internal/repository/MeetingEntity.java | 4 ++-- .../cn/group/internal/repository/MeetingRepository.java | 2 +- service/src/main/resources/application.yml| 15 ++- .../{mariadb => postgresql}/V1__initial_setup.sql | 12 ++-- shared.gradle | 3 ++- 15 files changed, 36 insertions(+), 29 deletions(-) diff --git a/NOTICE.txt b/NOTICE.txt index 5f2a7ce..a572ee5 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -1,5 +1,5 @@ Apache Fineract CN Group -Copyright [2017-2018] The Apache Software Foundation +Copyright [2017-2019] The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). \ No newline at end of file diff --git a/component-test/src/main/java/org/apache/fineract/cn/group/SuiteTestEnvironment.java b/component-test/src/main/java/org/apache/fineract/cn/group/SuiteTestEnvironment.java index 8cd3a8e..720e949 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/group/SuiteTestEnvironment.java +++ b/component-test/src/main/java/org/apache/fineract/cn/group/SuiteTestEnvironment.java @@ -21,7 +21,7 @@ package org.apache.fineract.cn.group; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.junit.ClassRule; import org.junit.rules.RuleChain; import org.junit.rules.TestRule; @@ -32,14 +32,14 @@ public class SuiteTestEnvironment { static final TestEnvironment testEnvironment = new TestEnvironment(APP_NAME); static final CassandraInitializer cassandraInitializer = new CassandraInitializer(); -static final MariaDBInitializer mariaDBInitializer = new MariaDBInitializer(); +static final PostgreSQLInitializer postgreSQLInitializer = new PostgreSQLInitializer(); static final TenantDataStoreContextTestRule tenantDataStoreContext = - TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, mariaDBInitializer); + TenantDataStoreContextTestRule.forRandomTenantName(cassandraInitializer, postgreSQLInitializer); @ClassRule public static TestRule orderClassRules = RuleChain .outerRule(testEnvironment) .around(cassandraInitializer) -.around(mariaDBInitializer) +.around(postgreSQLInitializer) .around(tenantDataStoreContext); } \ No newline at end of file diff --git a/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java index a78017a..4cd2ae8 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java +++ b/component-test/src/main/java/org/apache/fineract/cn/group/TestGroup.java @@ -43,7 +43,7 @@ import org.apache.fineract.cn.api.context.AutoUserContext; import org.apache.fineract.cn.test.env.TestEnvironment; import org.apache.fineract.cn.test.fixture.TenantDataStoreContextTestRule; import org.apache.fineract.cn.test.fixture.cassandra.CassandraInitializer; -import org.apache.fineract.cn.test.fixture.mariadb.MariaDBInitializer; +import org.apache.fineract.cn.test.fixture.postgresql.PostgreSQLInitializer; import org.apache.fineract.cn.test.listener.EnableEventRecording; import org.apache.fineract.cn.test.listener.EventRecorder; import org.junit.After; diff --git a/component-test/src/main/java/org/apa
[fineract-cn-portfolio] branch develop updated (96b775f -> 77d203c)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-portfolio.git. from 96b775f FINCN-170 create multi-stage Docker build (#17) new 741f996 Migrate portfolio service from MariaDB to PostgreSQL new 66eafed Fixed Query error new b33e70b Merge pull request #1 from ebenezergraham/FINCN-2 new 6831ea4 Merge branch 'develop' into FINCN-124 new 77d203c Merge pull request #15 from Izakey/FINCN-124 The 317 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 1 + NOTICE.txt | 2 +- .../cn/portfolio/AbstractPortfolioTest.java| 2 +- .../cn/portfolio/SuiteTestEnvironment.java | 6 +++--- service/build.gradle | 3 ++- .../internal/repository/LateCaseEntity.java| 2 +- .../config/PortfolioServiceConfiguration.java | 4 ++-- .../command/handler/InitializeCommandHandler.java | 2 +- .../internal/repository/CaseCommandEntity.java | 2 +- .../service/internal/repository/CaseEntity.java| 2 +- .../internal/repository/CaseRepository.java| 2 +- .../service/internal/repository/ProductEntity.java | 2 +- .../internal/repository/TaskInstanceEntity.java| 2 +- service/src/main/resources/application.yml | 22 +- .../V10__arrears_determination2.sql| 2 +- .../V11__case_documents.sql| 2 +- .../V12__persist_start_of_term_locally.sql | 0 .../{mariadb => postgresql}/V1__initial_setup.sql | 18 +- .../{mariadb => postgresql}/V2__in_motion.sql | 2 +- .../{mariadb => postgresql}/V3__task_instances.sql | 2 +- .../V4__fixing_in_motion_migration.sql | 0 .../V5__readonly_charges.sql | 0 .../V6__interest_and_charges.sql | 0 .../V7__balance_segment_sets.sql | 2 +- .../V8__late_payment_determination.sql | 0 .../V9__arrears_determination.sql | 4 ++-- shared.gradle | 3 ++- 27 files changed, 52 insertions(+), 37 deletions(-) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V10__arrears_determination2.sql (96%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V11__case_documents.sql (97%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V12__persist_start_of_term_locally.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V1__initial_setup.sql (94%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V2__in_motion.sql (91%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V3__task_instances.sql (97%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V4__fixing_in_motion_migration.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V5__readonly_charges.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V6__interest_and_charges.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V7__balance_segment_sets.sql (96%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V8__late_payment_determination.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V9__arrears_determination.sql (95%)
[fineract-cn-accounting] branch develop updated (d8f36aa -> 626a19a)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-accounting.git. from d8f36aa Merge pull request #15 from aasaru/multi-stage-docker-build new 9c23639 Migrate customer service from MariaDB to PostgreSQL new 200d992 Fixed Failing Import new 119b9b2 Merge pull request #1 from ebenezergraham/FINCN-2 new 4305780 Merge branch 'develop' into FINCN-121 new 626a19a Merge pull request #12 from Izakey/FINCN-121 The 177 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE.txt | 2 +- .../cn/accounting/AbstractAccountingTest.java | 2 +- .../cn/accounting/SuiteTestEnvironment.java| 6 +- service/build.gradle | 2 +- .../service/AccountingServiceConfiguration.java| 4 +- .../command/handler/MigrationCommandHandler.java | 2 +- .../service/internal/repository/AccountEntity.java | 14 +- .../internal/repository/AccountEntryEntity.java| 161 +++-- .../repository/AccountEntryRepository.java | 2 +- .../service/internal/repository/CommandEntity.java | 2 +- .../service/internal/repository/LedgerEntity.java | 2 +- service/src/main/resources/application.yml | 15 +- .../{mariadb => postgresql}/V1__initial_setup.sql | 10 +- .../V2__add_column_to_ledger.sql | 2 +- .../{mariadb => postgresql}/V3__create_tx_type.sql | 2 +- .../V4__adjust_account_identifier_length.sql | 2 +- .../V5__add_ichq_to_tx_types.sql | 0 .../V6__add_payroll_distribution.sql | 4 +- .../V7__drop_payroll_distributions.sql | 0 .../V8__alternative_account_number.sql | 0 .../V9__add_total_value_ledger.sql | 0 shared.gradle | 7 +- 22 files changed, 120 insertions(+), 121 deletions(-) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V1__initial_setup.sql (93%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V2__add_column_to_ledger.sql (96%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V3__create_tx_type.sql (99%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V4__adjust_account_identifier_length.sql (88%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V5__add_ichq_to_tx_types.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V6__add_payroll_distribution.sql (90%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V7__drop_payroll_distributions.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V8__alternative_account_number.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V9__add_total_value_ledger.sql (100%)
[fineract-cn-customer] branch develop updated (8019724 -> f48f304)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-customer.git. from 8019724 Merge pull request #13 from aasaru/multi-stage-docker-build new 0a0ec86 Migrate customer service from MariaDb to PostgreSQL new 24061b3 Migrate customer service from MariaDB to PostgreSQL new eb5e11c Fixed flyway migration scripts new 344bccf Ensure target for flyway migrations is playground database new d775537 Replaced BIGINT with BIGSERIAL to enable id sequence generation new 3c18feb Merge pull request #1 from ebenezergraham/FINCN-116 new 25eb3ae Merge branch 'develop' into FINCN-116 new f48f304 Merge pull request #10 from Izakey/FINCN-116 The 113 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitignore | 3 +- NOTICE.txt | 2 +- .../fineract/cn/customer/AbstractCustomerTest.java | 2 +- .../fineract/cn/customer/SuiteTestEnvironment.java | 6 +- .../apache/fineract/cn/customer/TestCustomer.java | 1 - .../fineract/cn/customer/TestTaskDefinition.java | 9 +- .../fineract/cn/customer/catalog/TestCatalog.java | 8 +- service/build.gradle | 2 +- .../config/CatalogServiceConfiguration.java| 4 +- .../catalog/internal/repository/CatalogEntity.java | 2 +- .../catalog/internal/repository/FieldEntity.java | 6 +- .../catalog/internal/repository/OptionEntity.java | 2 +- .../command/handler/MigrationAggregate.java| 2 +- .../config/CustomerServiceConfiguration.java | 4 +- .../internal/repository/CommandEntity.java | 2 +- .../internal/repository/CustomerEntity.java| 4 +- .../internal/repository/DocumentEntity.java| 2 +- .../repository/IdentificationCardEntity.java | 4 +- .../repository/IdentificationCardScanEntity.java | 2 +- .../repository/TaskDefinitionRepository.java | 2 +- .../internal/repository/TaskInstanceEntity.java| 2 +- service/src/main/resources/application.yml | 15 +- .../db/migrations/mariadb/V1__initial_setup.sql| 168 - .../mariadb/V5__add_payroll_distributions.sql | 42 -- .../db/migrations/mariadb/V7__documents.sql| 42 -- .../db/migrations/postgresql/V1__initial_setup.sql | 66 .../V2__customer_portrait.sql | 12 +- .../V3__added_is_member_flag.sql | 2 +- .../V4__identification_card_scans.sql | 18 +-- .../postgresql/V5__add_payroll_distributions.sql | 28 .../V6__drop_pyroll_distributions.sql | 0 .../db/migrations/postgresql/V7__documents.sql | 28 .../V8__documents_description.sql | 0 .../V9__add_application_date_to_customer.sql | 2 +- shared.gradle | 6 +- 35 files changed, 179 insertions(+), 321 deletions(-) delete mode 100644 service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql delete mode 100644 service/src/main/resources/db/migrations/mariadb/V5__add_payroll_distributions.sql delete mode 100644 service/src/main/resources/db/migrations/mariadb/V7__documents.sql create mode 100644 service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V2__customer_portrait.sql (74%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V3__added_is_member_flag.sql (93%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V4__identification_card_scans.sql (53%) create mode 100644 service/src/main/resources/db/migrations/postgresql/V5__add_payroll_distributions.sql rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V6__drop_pyroll_distributions.sql (100%) create mode 100644 service/src/main/resources/db/migrations/postgresql/V7__documents.sql rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V8__documents_description.sql (100%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V9__add_application_date_to_customer.sql (90%)
[fineract-cn-office] branch develop updated (608413c -> f52bce5)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-office.git. from 608413c FINCN-170 create multi-stage Docker build (#12) new f810d83 Migrate office service from MariaDB to PostgreSQL new 3475cb1 Migrate office service from MariaDB to PostgreSQL new 542ab47 Fixed flyway migration scripts new 5964cde Ensure migrations target database playground new 540902e Changed BIGINT to BIGSERIAL new e139e75 Merge pull request #1 from ebenezergraham/FINCN-2 new 1284913 Merge branch 'develop' into FINCN-117 new f52bce5 Merge pull request #9 from Izakey/FINCN-117 The 53 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE.txt | 2 +- .../fineract/cn/office/AbstractOfficeTest.java | 8 +- .../fineract/cn/office/SuiteTestEnvironment.java | 8 +- service/build.gradle | 2 +- .../command/handler/MigrationAggregate.java| 2 +- .../config/OfficeServiceConfiguration.java | 4 +- service/src/main/resources/application.yml | 15 ++-- .../db/migrations/mariadb/V1__initial_setup.sql| 87 -- .../db/migrations/postgresql/V1__initial_setup.sql | 34 + .../V2__add_external_references.sql| 10 +-- shared.gradle | 22 +++--- 11 files changed, 70 insertions(+), 124 deletions(-) delete mode 100644 service/src/main/resources/db/migrations/mariadb/V1__initial_setup.sql create mode 100644 service/src/main/resources/db/migrations/postgresql/V1__initial_setup.sql rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V2__add_external_references.sql (69%)
[fineract-cn-rhythm] branch develop updated (ddd1c97 -> 7dfb53b)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-rhythm.git. from ddd1c97 FINCN-170 create multi-stage Docker build (#11) new 506e31b Migrate rhythm library from MariaDB to PostgreSQL new b64aad5 Adapt SQL statements to PostgreSQL and fix Spring datasource properties new a11c4d3 Changed BIGINT to BIGSERIAL in flyway migration scripts new 7dfb53b Merge pull request #8 from Izakey/FINCN115 The 91 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE.txt | 2 +- .../apache/fineract/cn/rhythm/AbstractRhythmTest.java| 8 service/build.gradle | 2 +- .../cn/rhythm/service/config/RhythmConfiguration.java| 4 ++-- .../command/handler/InitializeCommandHandler.java| 2 +- .../rhythm/service/internal/repository/BeatEntity.java | 2 +- service/src/main/resources/application.yml | 16 +++- .../{mariadb => postgresql}/V1__initial_setup.sql| 10 -- .../{mariadb => postgresql}/V2__tenant_clock_offset.sql | 4 ++-- shared.gradle| 5 +++-- 10 files changed, 30 insertions(+), 25 deletions(-) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V1__initial_setup.sql (89%) rename service/src/main/resources/db/migrations/{mariadb => postgresql}/V2__tenant_clock_offset.sql (93%)
[fineract-cn-provisioner] branch develop updated (336042b -> 4327ce0)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-provisioner.git. from 336042b Merge pull request #10 from aasaru/multi-stage-docker-build new 47b1434 Migrate provisioner from MariaDB to PostgreSQL new 2a1312c Adapt SQL statements to work with PostgreSQL,add Spring datasource properties too new f34a8ab Minute changes inorder to create upstream FINCN-129 branch new b83331b Ensure that seshat db and tenants table gets created new 56155da Fixing creation of database seshat and table tenants new a06a654 Fixed issues connecting to the databases new 4327ce0 Merge pull request #6 from Izakey/FINCN-129 The 83 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: NOTICE.txt | 2 +- component-test/build.gradle| 3 +- .../cn/provisioner/AbstractServiceTest.java| 7 +- java => ProvisionerPostgreSQLInitializer.java} | 25 +++--- .../tenant/TestTenantApplicationAssignment.java| 6 +- component-test/src/main/resources/application.yaml | 9 ++- service/build.gradle | 1 - .../config/ProvisionerServiceConfig.java | 4 +- .../repository/ProvisionerInitializer.java | 88 +++--- .../provisioner/internal/repository/TenantDAO.java | 24 ++ .../internal/service/TenantService.java| 70 - .../provisioner/internal/util/DataSourceUtils.java | 39 ++ .../provisioner/internal/util/JdbcUrlBuilder.java | 4 +- service/src/main/resources/application.yaml| 17 +++-- shared.gradle | 4 +- 15 files changed, 172 insertions(+), 131 deletions(-) rename component-test/src/main/java/org/apache/fineract/cn/provisioner/{ProvisionerMariaDBInitializer.java => ProvisionerPostgreSQLInitializer.java} (65%)
[fineract-cn-notifications] 09/43: update
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit a62f69fb15d5b4d1e181e22b0fbb1f04f83b6c10 Author: Ebenezer Graham AuthorDate: Fri Jun 15 01:09:12 2018 +0400 update --- .../notification/api/v1/domain/Notification.java | 76 -- .../api/v1/events/NotificationEventConstants.java | 4 -- .../service/NotificationConfiguration.java | 2 + .../service/internal/service/SMSSender.java| 20 +++--- service/src/main/resources/application.yml | 5 +- 5 files changed, 18 insertions(+), 89 deletions(-) diff --git a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/domain/Notification.java b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/domain/Notification.java deleted file mode 100644 index c685c5a..000 --- a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/domain/Notification.java +++ /dev/null @@ -1,76 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.fineract.cn.notification.api.v1.domain; - -import java.util.Objects; -import org.apache.fineract.cn.lang.validation.constraints.ValidIdentifier; -import org.hibernate.validator.constraints.Length; - -@SuppressWarnings({"WeakerAccess", "unused"}) -public class Notification { - @ValidIdentifier - private String identifier; - @Length(max = 512) - private String payload; - - private String recipient; - - private String message; - - public Notification() { -super(); - } - - public static Notification create(final String identifier, final String payload) { -final Notification notification = new Notification(); -notification.setIdentifier(identifier); -notification.setPayload(payload); -return notification; - } - - public String getIdentifier() { -return this.identifier; - } - - public void setIdentifier(final String identifier) { -this.identifier = identifier; - } - - public String getPayload() { -return payload; - } - - public void setPayload(String payload) { -this.payload = payload; - } - - @Override - public boolean equals(Object o) { -if (this == o) return true; -if (o == null || getClass() != o.getClass()) return false; -Notification notification = (Notification) o; -return Objects.equals(identifier, notification.identifier) && -Objects.equals(payload, notification.payload); - } - - @Override - public int hashCode() { -return Objects.hash(identifier, payload); - } -} diff --git a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/events/NotificationEventConstants.java b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/events/NotificationEventConstants.java index 3f351c6..39c6eb0 100644 --- a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/events/NotificationEventConstants.java +++ b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/events/NotificationEventConstants.java @@ -28,8 +28,4 @@ public interface NotificationEventConstants { String SELECTOR_INITIALIZE = SELECTOR_NAME + " = '" + INITIALIZE + "'"; String SELECTOR_POST_SAMPLE = SELECTOR_NAME + " = '" + POST_SAMPLE + "'"; -//Customer constants; -String CUSTOMER_DESTINATION = "customer-v1"; -String SELECTOR_POST_CUSTOMER = SELECTOR_NAME + " = 'post-customer'"; - } diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/NotificationConfiguration.java b/service/src/main/java/org/apache/fineract/cn/notification/service/NotificationConfiguration.java index 01aa6d3..c38d6bd 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/NotificationConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/NotificationConfiguration.java @@ -79,6 +79,8 @@ public class NotificationConfiguration extends WebMvcConfigurerAdapter { configurer.setUseSuffixPatternMatch(Boolean.FALSE); } + + @Bean @Qualifier("gmail")
[fineract-cn-notifications] 26/43: Merge branch 'develop' into permitted-feign-client-auth
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 76e9930a5aab6f8fb1712f674c13d94d5c67a3b8 Merge: f3deeaa a202f47 Author: Ebenezer Graham AuthorDate: Fri May 24 16:31:35 2019 +0400 Merge branch 'develop' into permitted-feign-client-auth .travis.yml | 2 +- README.md| 5 +++-- service/build.gradle | 1 - shared.gradle| 1 - 4 files changed, 4 insertions(+), 5 deletions(-) diff --cc .travis.yml index 06d4b4d,b70bfc3..bffe9d0 --- a/.travis.yml +++ b/.travis.yml @@@ -27,4 -27,4 +27,4 @@@ env - BUILD_SNAPSHOTS_BRANCH=develop - ARTIFACTORY_URL=https://mifos.jfrog.io/mifos - ARTIFACTORY_USER=travis-ci - - secure: "E5IyImya7x5cHLB1vGLGIJUC1M+7RxKZivb5iUM+RR/xW39/7b4Qd3JeX4yBUeiPjf9lNMMxcGVyqI/4htT95++WCNc0u6OoxwGgxQEB9JHE8OWecaYgK4uLO7+651XF4DNbSiH3NVmc2b8Q0c0jBlu3MHAeEUIQ6BOiTXSsqnewtWAW0XETBooNmo2nTqZyKvzez0698oJuuYfZeFbqm8wJ9rIwtptyJluRzqcTlzw1cH/CvcIskLDmITVqbuZxAW59j1BqUnZNQpuOFZ692iqntdxq78CxliCG1MEYy4zWY8xcIWNVp28OKkMULXdi+V80oZXY4TyTwZfH6e2oZFz6/X9GpNNR6EwaHV0tT3wZi2NrkoBokD8bEBxQubIgxDCaDAFG9VMByC+++nwm0GJzerKBV4CpNSy/93XLrFAQ8+lOVauVtkVHuzFBWleLLQYcBGAXRz/C/UF4/m0m014jvD7v [...] -- secure: "NHjl/OM08+Q8zRXH1GRowPmFTCarpZVgpfzvW23DnHI9kwPcAuvXHUs0liBD1FgUr3oFNlIQ8QknlWSAb2yI9CTs/+v6f7wl4t4Xx4t5gV0wFuffb3W7a41bE+m1OSUunleSGLKr4qGffjPQ63EUyAb4wrywg23iY12OHbQ3a988UvqoDg6IjK7NXKeLhkAXg6qLDRh9aHdM6NknFNUUIbYyX25PMTQj/SShDQ3xptOhrj1wOvKbBEBc2t2X4+0/3pKt36W0VwJt68HPL4YKwFNiErqSXDAmKFwcf/aZxlXAGreCYN9rNuGuP5RMpblY1bNi6sW2COG0IgTjNSvQgULfIb42GI68O9w0supKZ8OKQLnDJDIQ5q1A1rE54bqs1ey8WD9bmwc24NTUkmjKTqDMTMqCLE+gXLM7xnS2JNisOETfEfRughUFBvmHVPgnQ6fCDJ0brPWBO9Se/elPP/XWlWAk [...] ++- secure: "NHjl/OM08+Q8zRXH1GRowPmFTCarpZVgpfzvW23DnHI9kwPcAuvXHUs0liBD1FgUr3oFNlIQ8QknlWSAb2yI9CTs/+v6f7wl4t4Xx4t5gV0wFuffb3W7a41bE+m1OSUunleSGLKr4qGffjPQ63EUyAb4wrywg23iY12OHbQ3a988UvqoDg6IjK7NXKeLhkAXg6qLDRh9aHdM6NknFNUUIbYyX25PMTQj/SShDQ3xptOhrj1wOvKbBEBc2t2X4+0/3pKt36W0VwJt68HPL4YKwFNiErqSXDAmKFwcf/aZxlXAGreCYN9rNuGuP5RMpblY1bNi6sW2COG0IgTjNSvQgULfIb42GI68O9w0supKZ8OKQLnDJDIQ5q1A1rE54bqs1ey8WD9bmwc24NTUkmjKTqDMTMqCLE+gXLM7xnS2JNisOETfEfRughUFBvmHVPgnQ6fCDJ0brPWBO9Se/elPP/XWlWAk [...] diff --cc README.md index 7528145,c993eee..7a6daff --- a/README.md +++ b/README.md @@@ -1,6 -1,6 +1,7 @@@ - # Apache Fineract CN Notification [![Build Status](https://api.travis-ci.com/apache/fineract-cn-notification.svg?branch=develop)](https://travis-ci.com/apache/fineract-cn-notification) + - This mircroservice contains all the functionalities for SMS and Email Notification + # Apache Fineract CN Notification [![Build Status](https://api.travis-ci.com/apache/fineract-cn-notifications.svg?branch=develop)](https://travis-ci.com/apache/fineract-cn-notifications) + -This mircroservice contains all the functionalities for SMS and Email Notification ++This mircroservice implements SMS and Email Notification functionalities ## Abstract Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world.
[fineract-cn-notifications] 07/43: fixed the build
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 9b71ab2a2fb65a0ac83276a56c2beaa086c98307 Author: Ebenezer Graham AuthorDate: Thu Jun 14 23:06:09 2018 +0400 fixed the build --- shared.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shared.gradle b/shared.gradle index a01bb15..4a65927 100644 --- a/shared.gradle +++ b/shared.gradle @@ -16,7 +16,7 @@ */ group 'org.apache.fineract.cn.notification' -version '0.1.0.BUILD-SNAPSHOT' +version '0.1.0-BUILD-SNAPSHOT' ext.versions = [ fineractcnidentity : '0.1.0-BUILD-SNAPSHOT',
[fineract-cn-notifications] 42/43: Update SMSService.java
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 2a811faff12968b16a763d00f8975fafc4807c31 Author: Ebenezer Graham AuthorDate: Mon Sep 2 01:02:07 2019 +0400 Update SMSService.java --- .../fineract/cn/notification/service/internal/service/SMSService.java| 1 - 1 file changed, 1 deletion(-) diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSService.java b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSService.java index 42f01f1..36bd2f2 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSService.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/internal/service/SMSService.java @@ -32,7 +32,6 @@ import org.apache.fineract.cn.notification.api.v1.events.NotificationEventConsta import org.apache.fineract.cn.notification.service.ServiceConstants; import org.apache.fineract.cn.notification.service.internal.mapper.SMSConfigurationMapper; import org.apache.fineract.cn.notification.service.internal.repository.SMSGatewayConfigurationRepository; -import org.hibernate.mapping.Map; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier;
[fineract-cn-notifications] 17/43: Merge pull request #6 from ebenezergraham/develop
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 425c6ae0f5d81620419c32d29a5bed2fe880459d Merge: f3296bb 6b1b5f7 Author: Awasum Yannick AuthorDate: Mon Sep 17 10:10:36 2018 +0100 Merge pull request #6 from ebenezergraham/develop Increment 2 .gitignore | 10 +- .travis.yml| 49 - .../notification/api/v1/PermittableGroupIds.class | Bin 328 -> 261 bytes .../api/v1/client/IamATeapotException.class| Bin 392 -> 0 bytes .../api/v1/client/NotificationManager.class| Bin 1474 -> 1940 bytes .../api/v1/domain/EmailConfiguration.class | Bin 3790 -> 4391 bytes .../notification/api/v1/domain/Notification.class | Bin 1820 -> 0 bytes .../api/v1/domain/SMSConfiguration.class | Bin 2972 -> 3305 bytes .../cn/notification/api/v1/domain/Sample.class | Bin 1752 -> 0 bytes .../api/v1/events/NotificationEventConstants.class | Bin 666 -> 1609 bytes .../notification/api/v1/PermittableGroupIds.java |3 +- ...on.java => ConfigurationNotFoundException.java} |9 +- .../api/v1/client/NotificationManager.java | 80 +- .../api/v1/domain/EmailConfiguration.java | 283 +- .../cn/notification/api/v1/domain/EmailPage.java | 81 + .../cn/notification/api/v1/domain/Event.java | 69 + .../api/v1/domain/SMSConfiguration.java| 202 +- .../cn/notification/api/v1/domain/SMSPage.java | 81 + .../cn/notification/api/v1/domain/Sample.java | 72 - .../api/v1/events/NotificationEventConstants.java | 30 +- ...SampleTest.java => EmailConfigurationTest.java} | 69 +- .../domain/{SampleTest.java => EmailPageTest.java} | 71 +- .../v1/domain/{SampleTest.java => EventTest.java} | 59 +- .../api/v1/domain/SMSConfigurationTest.java| 65 + .../domain/{SampleTest.java => SMSPageTest.java} | 66 +- .../cn/notification/api/v1/domain}/TestSuite.java | 11 +- component-test/build.gradle|2 +- .../cn/notification/SuiteTestEnvironment.java | 24 +- .../fineract/cn/notification/TestEmailService.java | 96 + .../fineract/cn/notification/TestNotification.java | 112 + .../fineract/cn/notification/TestSMSService.java | 102 + .../fineract/cn/notification/TestSample.java | 137 - .../apache/fineract/cn/notification/TestSuite.java |4 +- .../listener/MigrationEventListener.java | 36 +- ...istener.java => NotificationEventListener.java} | 48 +- .../notification/util/DomainObjectGenerator.java | 53 + service/build.gradle | 15 +- service/out/production/resources/application.yml | 26 +- .../db/migrations/mariadb/V1__initial_setup.sql| 74 +- .../service/NotificationApplication.java | 16 +- .../service/NotificationConfiguration.java | 131 +- .../cn/notification/service/ServiceConstants.java |9 +- ...d.java => CreateEmailConfigurationCommand.java} | 40 +- ...and.java => CreateSMSConfigurationCommand.java} | 40 +- .../internal/command/InitializeServiceCommand.java | 18 +- .../{SampleCommand.java => PostSMSCommand.java}| 40 +- .../handler/EmailConfigurationAggregate.java | 57 + .../internal/command/handler/EventsAggregate.java | 49 + .../command/handler/MigrationAggregate.java| 63 +- .../command/handler/SMSConfigurationAggregate.java | 56 + .../internal/command/handler/SampleAggregate.java | 68 - .../internal/mapper/EmailConfigurationMapper.java | 59 +- .../internal/mapper/SMSConfigurationMapper.java| 50 +- .../service/internal/mapper/SampleMapper.java | 46 - .../repository/EmailGatewayConfiguration.java | 124 - .../EmailGatewayConfigurationEntity.java | 134 + .../EmailGatewayConfigurationRepository.java |9 +- .../repository/SMSGatewayConfiguration.java| 94 - .../repository/SMSGatewayConfigurationEntity.java | 94 + .../SMSGatewayConfigurationRepository.java |9 +- .../internal/repository/SampleJpaEntity.java | 64 - .../internal/repository/TemplateEntity.java| 102 + ...tityRepository.java => TemplateRepository.java} |7 +- .../service/internal/service/EmailSender.java | 60 - .../service/internal/service/EmailService.java | 79 + .../internal/service/NotificationService.java | 118 + .../service/internal/service/SMSSender.java| 57 - .../service/internal/service/SMSService.java | 68 + .../service/internal/service/SampleService.java| 48 - .../service/helperservice/CustomerAdaptor.java | 55 + .../helperservice/NotificationAuthentication.java | 60 + .../service/listener/Accoun
[fineract-cn-notifications] branch develop updated (abd7186 -> 66d01fa)
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git. from abd7186 FINCN-170 create multi-stage Docker build (#15) new 13a1f55 Message Templating new 339f83f Merge branch 'develop' into FINCN-156 new 286c314 Refactoring API Naming Conventions new 6b0cd7a Retained JMS Configuration new 2a811fa Update SMSService.java new 66d01fa Merge pull request #11 from ebenezergraham/FINCN-156 The 43 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...ava => ConfigurationAlreadyExistException.java} | 2 +- .../api/v1/client/NotificationManager.java | 42 +- ...ion.java => TemplateAlreadyExistException.java} | 2 +- ...ception.java => TemplateNotFoundException.java} | 2 +- .../cn/notification/api/v1/domain/Template.java| 110 + .../api/v1/events/NotificationEventConstants.java | 6 + component-test/build.gradle| 4 +- .../cn/notification/AbstractNotificationTest.java | 12 +- .../cn/notification/EmailApiDocumentation.java | 6 +- .../cn/notification/SmsApiDocumentation.java | 7 +- .../fineract/cn/notification/TestEmailService.java | 80 ++-- .../fineract/cn/notification/TestSMSService.java | 17 +- .../apache/fineract/cn/notification/TestSuite.java | 5 +- .../notification/importer/TestTemplateImport.java | 55 +++ ...stener.java => ConfigurationEventListener.java} | 57 ++- .../cn/notification/listener/EventListener.java| 48 +-- .../fineract/cn/notification/listener/TestJMS.java | 35 +- .../main/resources/importdata/test-templates.csv | 2 + .../src/main/resources/logback-test.xml| 31 +- .../src/main/resources/templates/template.html | 457 + service/build.gradle | 5 +- .../cn/notification/service/ServiceConstants.java | 12 +- ...tionCommand.java => CreateTemplateCommand.java} | 18 +- .../handler/EmailConfigurationCommandHandler.java | 4 +- .../handler/SMSConfigurationCommandHandler.java| 4 +- ...andHandler.java => TemplateCommandHandler.java} | 56 +-- .../internal/config/NotificationConfiguration.java | 33 +- .../internal/identity/CustomerPermittedClient.java | 46 --- .../identity/NotificationAuthentication.java | 89 .../internal/importer/TemplateImporter.java| 92 + .../internal/mapper/EmailConfigurationMapper.java | 4 + .../service/internal/mapper/TemplateMapper.java| 51 +++ .../internal/repository/ApplicationEntity.java | 106 - .../internal/repository/ApplicationRepository.java | 34 -- .../EmailGatewayConfigurationRepository.java | 7 +- .../SMSGatewayConfigurationRepository.java | 6 +- .../internal/repository/TemplateEntity.java| 56 ++- .../internal/repository/TemplateRepository.java| 8 +- .../service/internal/service/EmailService.java | 135 +++--- .../internal/service/NotificationService.java | 46 +-- .../service/internal/service/SMSService.java | 20 +- .../CustomerService.java => TemplateService.java} | 45 +- .../service/util/MailBuilder.java} | 37 +- .../service/listener/CustomerEventListener.java| 91 ++-- .../service/rest/EmailServiceRestController.java | 61 ++- .../service/rest/SMSServiceRestController.java | 16 +- ...Controller.java => TemplateRestController.java} | 63 ++- service/src/main/resources/application.yml | 13 - .../db/migrations/mariadb/V1__initial_setup.sql| 40 +- .../main/resources/templatedetails/templates.csv | 10 + service/src/main/resources/templates/template.html | 457 + shared.gradle | 8 +- 52 files changed, 1839 insertions(+), 814 deletions(-) copy api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/{ConfigurationNotFoundException.java => ConfigurationAlreadyExistException.java} (91%) copy api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/{ConfigurationNotFoundException.java => TemplateAlreadyExistException.java} (91%) copy api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/{ConfigurationNotFoundException.java => TemplateNotFoundException.java} (91%) create mode 100644 api/src/main/java/org/apache/fineract/cn/notification/api/v1/domain/Template.java create mode 100644 component-test/src/main/java/org/apache/fineract/cn/notification/importer/TestTemplateImport.java copy component-test/src/main/java/org/apache/fineract/cn/notification/listener/{EventListener.java => ConfigurationEventListener.java} (
[fineract-cn-notifications] 28/43: Added after_failure procedure to output rat report as plain text on Travis
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 5a04ac377cb2fdd6cdb90838b4050ea61f901c1b Author: ebenezergraham AuthorDate: Sat May 25 22:26:18 2019 +0400 Added after_failure procedure to output rat report as plain text on Travis --- .travis.yml | 5 + shared.gradle | 43 ++- 2 files changed, 27 insertions(+), 21 deletions(-) diff --git a/.travis.yml b/.travis.yml index b70bfc3..0df6a41 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,3 +28,8 @@ env: - ARTIFACTORY_URL=https://mifos.jfrog.io/mifos - ARTIFACTORY_USER=travis-ci - secure: "NHjl/OM08+Q8zRXH1GRowPmFTCarpZVgpfzvW23DnHI9kwPcAuvXHUs0liBD1FgUr3oFNlIQ8QknlWSAb2yI9CTs/+v6f7wl4t4Xx4t5gV0wFuffb3W7a41bE+m1OSUunleSGLKr4qGffjPQ63EUyAb4wrywg23iY12OHbQ3a988UvqoDg6IjK7NXKeLhkAXg6qLDRh9aHdM6NknFNUUIbYyX25PMTQj/SShDQ3xptOhrj1wOvKbBEBc2t2X4+0/3pKt36W0VwJt68HPL4YKwFNiErqSXDAmKFwcf/aZxlXAGreCYN9rNuGuP5RMpblY1bNi6sW2COG0IgTjNSvQgULfIb42GI68O9w0supKZ8OKQLnDJDIQ5q1A1rE54bqs1ey8WD9bmwc24NTUkmjKTqDMTMqCLE+gXLM7xnS2JNisOETfEfRughUFBvmHVPgnQ6fCDJ0brPWBO9Se/elPP/XWlWAkd [...] + +after_failure: + - ./gradlew rat + - cat api/build/reports/rat/rat-report.txt + diff --git a/shared.gradle b/shared.gradle index 3cdcce8..e9f8108 100644 --- a/shared.gradle +++ b/shared.gradle @@ -19,25 +19,25 @@ group 'org.apache.fineract.cn.notification' version '0.1.0-BUILD-SNAPSHOT' ext.versions = [ -fineractcnidentity : '0.1.0-BUILD-SNAPSHOT', -fineractcnoffice: '0.1.0-BUILD-SNAPSHOT', -fineractcncustomer : '0.1.0-BUILD-SNAPSHOT', -fineractcnaccounting: '0.1.0-BUILD-SNAPSHOT', -fineractcnportfolio : '0.1.0-BUILD-SNAPSHOT', -fineractcnteller: '0.1.0-BUILD-SNAPSHOT', -fineractcnpayroll : '0.1.0-BUILD-SNAPSHOT', -fineractcngroup : '0.1.0-BUILD-SNAPSHOT', -frameworkapi: '0.1.0-BUILD-SNAPSHOT', -frameworklang : '0.1.0-BUILD-SNAPSHOT', -frameworkasync : '0.1.0-BUILD-SNAPSHOT', -frameworkcassandra : '0.1.0-BUILD-SNAPSHOT', -frameworkmariadb: '0.1.0-BUILD-SNAPSHOT', -frameworkcommand: '0.1.0-BUILD-SNAPSHOT', -frameworktest : '0.1.0-BUILD-SNAPSHOT', -frameworkanubis : '0.1.0-BUILD-SNAPSHOT', -validator : '5.3.0.Final', -springjavamail : '1.4.1.RELEASE', -twilioapi : '7.17.+' +fineractcnidentity : '0.1.0-BUILD-SNAPSHOT', +fineractcnoffice: '0.1.0-BUILD-SNAPSHOT', +fineractcncustomer : '0.1.0-BUILD-SNAPSHOT', +fineractcnaccounting: '0.1.0-BUILD-SNAPSHOT', +fineractcnportfolio : '0.1.0-BUILD-SNAPSHOT', +fineractcnteller: '0.1.0-BUILD-SNAPSHOT', +fineractcnpayroll : '0.1.0-BUILD-SNAPSHOT', +fineractcngroup : '0.1.0-BUILD-SNAPSHOT', +frameworkapi: '0.1.0-BUILD-SNAPSHOT', +frameworklang : '0.1.0-BUILD-SNAPSHOT', +frameworkasync : '0.1.0-BUILD-SNAPSHOT', +frameworkcassandra : '0.1.0-BUILD-SNAPSHOT', +frameworkmariadb: '0.1.0-BUILD-SNAPSHOT', +frameworkcommand: '0.1.0-BUILD-SNAPSHOT', +frameworktest : '0.1.0-BUILD-SNAPSHOT', +frameworkanubis : '0.1.0-BUILD-SNAPSHOT', +validator : '5.3.0.Final', +springjavamail : '1.4.1.RELEASE', +twilioapi : '7.17.+' ] apply plugin: 'java' @@ -94,11 +94,11 @@ artifactory { } defaults { -publications ('api', 'componentTest', 'service', 'bootService') +publications('api', 'componentTest', 'service', 'bootService') } } } -artifactoryPublish.dependsOn('clean','publishToMavenLocal') +artifactoryPublish.dependsOn('clean', 'publishToMavenLocal') license { header rootProject.file('../HEADER') @@ -122,5 +122,6 @@ rat { "gradlew.bat", "README.md" ] +plainOutput = true }
[fineract-cn-notifications] 32/43: Merge pull request #13 from ebenezergraham/FINCN-157
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 857f39c8fe3f9c3ba92825b52a96d390a12d13a0 Merge: 044d72f 5a04ac3 Author: Awasum Yannick AuthorDate: Mon Jun 3 20:32:56 2019 +0100 Merge pull request #13 from ebenezergraham/FINCN-157 Adding after_failure procedure to CI .travis.yml | 5 + shared.gradle | 43 ++- 2 files changed, 27 insertions(+), 21 deletions(-) diff --cc shared.gradle index 033a13f,e9f8108..0f368bb --- a/shared.gradle +++ b/shared.gradle @@@ -120,8 -120,8 +120,9 @@@ rat "**/build/**", "gradlew", "gradlew.bat", -"README.md" +"README.md", +".dockerignore" ] + plainOutput = true }
[fineract-cn-notifications] 25/43: Merge pull request #12 from aasaru/artifactory
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit a202f477c4fcf80c3d17186f4a4a0a891c0b152a Merge: 3dc6d31 9efb0b1 Author: Awasum Yannick AuthorDate: Fri May 24 09:17:43 2019 +0100 Merge pull request #12 from aasaru/artifactory FINCN-148 build with travis-ci.com and upload artifacts to Artifactory .travis.yml | 30 +++ README.md | 2 +- api/build.gradle| 3 +- build.gradle| 8 + component-test/build.gradle | 4 ++- service/build.gradle| 5 ++-- shared.gradle | 17 +++ travis.sh | 71 + 8 files changed, 135 insertions(+), 5 deletions(-)
[fineract-cn-notifications] 05/43: update
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 13e3802db61dc28190a2a0102376074048af75a0 Author: Ebenezer Graham AuthorDate: Wed Jun 13 04:27:12 2018 +0400 update --- .../api/v1/client/NotificationManager.class| Bin 1462 -> 1474 bytes .../api/v1/domain/EmailConfiguration.class | Bin 0 -> 3790 bytes .../api/v1/domain/SMSConfiguration.class | Bin 0 -> 2972 bytes .../api/v1/client/NotificationManager.java | 6 +-- .../fineract/cn/notification/TestSample.java | 2 +- .../db/migrations/mariadb/V1__initial_setup.sql| 44 - .../db/migrations/mariadb/V1__initial_setup.sql| 44 - 7 files changed, 88 insertions(+), 8 deletions(-) diff --git a/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.class b/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.class index 3cb4555..741d5f5 100644 Binary files a/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.class and b/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.class differ diff --git a/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/domain/EmailConfiguration.class b/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/domain/EmailConfiguration.class new file mode 100644 index 000..dd410b5 Binary files /dev/null and b/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/domain/EmailConfiguration.class differ diff --git a/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/domain/SMSConfiguration.class b/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/domain/SMSConfiguration.class new file mode 100644 index 000..f7e3f18 Binary files /dev/null and b/api/out/production/classes/org/apache/fineract/cn/notification/api/v1/domain/SMSConfiguration.class differ diff --git a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java index 3c20ea3..6d0a7b1 100644 --- a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java +++ b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java @@ -34,7 +34,7 @@ import org.springframework.web.bind.annotation.RequestMethod; public interface NotificationManager { @RequestMapping( - value = "/sample", + value = "/notification", method = RequestMethod.GET, produces = MediaType.ALL_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE @@ -42,14 +42,14 @@ public interface NotificationManager { List findAllEntities(); @RequestMapping( - value = "/sample/{identifier}", + value = "/notification/{identifier}", method = RequestMethod.GET, produces = MediaType.ALL_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) Sample getEntity(@PathVariable("identifier") final String identifier); @RequestMapping( - value = "/sample", + value = "/notification", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE diff --git a/component-test/src/main/java/org/apache/fineract/cn/notification/TestSample.java b/component-test/src/main/java/org/apache/fineract/cn/notification/TestSample.java index 76db357..cc39439 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/notification/TestSample.java +++ b/component-test/src/main/java/org/apache/fineract/cn/notification/TestSample.java @@ -21,7 +21,7 @@ package org.apache.fineract.cn.notification; import org.apache.fineract.cn.notification.api.v1.client.NotificationManager; import org.apache.fineract.cn.notification.api.v1.domain.Sample; import org.apache.fineract.cn.notification.api.v1.events.NotificationEventConstants; -import org.apache.fineract.cn.notification.service.NotificationConfiguration; +import com.amazonaws.services.autoscaling.model.NotificationConfiguration; import java.util.List; import org.apache.commons.lang3.RandomStringUtils; import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; diff --git a/service/out/production/resources/db/migrations/mariadb/V1__initial_setup.sql b/service/out/production/resources/db/migrations/mariadb/V1__initial_setup.sql index b68edad..ff9a61f 100644 --- a/service/out/production/resources/db/migrations/mariadb/V1__initial_setup.sql +++ b/service/out/production/res
[fineract-cn-notifications] 43/43: Merge pull request #11 from ebenezergraham/FINCN-156
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 66d01fae93a0cba0850f24b2c2b562aa1abda5c9 Merge: abd7186 2a811fa Author: Isaac Kamga AuthorDate: Mon Sep 2 01:03:42 2019 +0100 Merge pull request #11 from ebenezergraham/FINCN-156 Thymeleaf templating for Email .../client/ConfigurationAlreadyExistException.java | 14 +- .../api/v1/client/NotificationManager.java | 42 +- .../v1/client/TemplateAlreadyExistException.java | 14 +- .../api/v1/client/TemplateNotFoundException.java | 14 +- .../cn/notification/api/v1/domain/Template.java| 110 + .../api/v1/events/NotificationEventConstants.java | 6 + component-test/build.gradle| 4 +- .../cn/notification/AbstractNotificationTest.java | 12 +- .../cn/notification/EmailApiDocumentation.java | 6 +- .../cn/notification/SmsApiDocumentation.java | 7 +- .../fineract/cn/notification/TestEmailService.java | 80 ++-- .../fineract/cn/notification/TestSMSService.java | 17 +- .../apache/fineract/cn/notification/TestSuite.java | 5 +- .../notification/importer/TestTemplateImport.java | 55 +++ ...stener.java => ConfigurationEventListener.java} | 57 ++- .../cn/notification/listener/EventListener.java| 48 +-- .../fineract/cn/notification/listener/TestJMS.java | 40 +- .../main/resources/importdata/test-templates.csv | 2 + component-test/src/main/resources/logback-test.xml | 35 ++ .../src/main/resources/templates/template.html | 457 + service/build.gradle | 5 +- .../cn/notification/service/ServiceConstants.java | 12 +- .../CreateTemplateCommand.java}| 34 +- .../handler/EmailConfigurationCommandHandler.java | 4 +- .../handler/SMSConfigurationCommandHandler.java| 4 +- ...andHandler.java => TemplateCommandHandler.java} | 56 +-- .../internal/config/NotificationConfiguration.java | 33 +- .../internal/identity/CustomerPermittedClient.java | 46 --- .../identity/NotificationAuthentication.java | 89 .../internal/importer/TemplateImporter.java| 92 + .../internal/mapper/EmailConfigurationMapper.java | 4 + .../service/internal/mapper/TemplateMapper.java| 51 +++ .../internal/repository/ApplicationEntity.java | 106 - .../EmailGatewayConfigurationRepository.java | 7 +- .../SMSGatewayConfigurationRepository.java | 6 +- .../internal/repository/TemplateEntity.java| 56 ++- .../internal/repository/TemplateRepository.java| 8 +- .../service/internal/service/EmailService.java | 135 +++--- .../internal/service/NotificationService.java | 46 +-- .../service/internal/service/SMSService.java | 20 +- .../service/internal/service/TemplateService.java | 60 +++ .../service/internal/service/util/MailBuilder.java | 36 +- .../service/listener/CustomerEventListener.java| 91 ++-- .../service/rest/EmailServiceRestController.java | 61 ++- .../service/rest/SMSServiceRestController.java | 16 +- ...Controller.java => TemplateRestController.java} | 63 ++- service/src/main/resources/application.yml | 13 - .../db/migrations/mariadb/V1__initial_setup.sql| 40 +- .../main/resources/templatedetails/templates.csv | 10 + service/src/main/resources/templates/template.html | 457 + shared.gradle | 8 +- 51 files changed, 1922 insertions(+), 772 deletions(-)
[fineract-cn-notifications] 34/43: Merge remote-tracking branch 'ebenezergraham/permitted-feign-client-auth' into permitted-feign-client-auth
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit c96fd87b4f867f6d591eee6a0a6054c7aefff9bc Merge: 1fba099 76605f3 Author: Ebenezer Graham AuthorDate: Thu Jun 6 03:00:30 2019 +0400 Merge remote-tracking branch 'ebenezergraham/permitted-feign-client-auth' into permitted-feign-client-auth Dockerfile| 4 ++-- shared.gradle | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)
[fineract-cn-notifications] 01/43: Increment One
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 509bf489e94df21e73ef551243f404daff4d621b Author: Ebenezer Graham AuthorDate: Sun Jun 10 01:03:15 2018 +0400 Increment One First increment of the notification Microservice - Created eventlisteners - Created repositories for configuration - Created SMS and Email Sender Objects --- README.md | 26 ++ 1 file changed, 26 insertions(+) diff --git a/README.md b/README.md new file mode 100644 index 000..e94a392 --- /dev/null +++ b/README.md @@ -0,0 +1,26 @@ +# Apache Fineract CN Notification + +This mircroservice contains all the functionalities for SMS and Email Notification + +## Abstract +Apache Fineract CN is an application framework for digital financial services, a system to support nationwide and cross-national financial transactions and help to level and speed the creation of an inclusive, interconnected digital economy for every nation in the world. + +## Versioning +The version numbers follow the [Semantic Versioning](http://semver.org/) scheme. + +In addition to MAJOR.MINOR.PATCH the following postfixes are used to indicate the development state. + +* BUILD-SNAPSHOT - A release currently in development. +* M - A _milestone_ release include specific sets of functions and are released as soon as the functionality is complete. +* RC - A _release candidate_ is a version with potential to be a final product, considered _code complete_. +* RELEASE - _General availability_ indicates that this release is the best available version and is recommended for all usage. + +The versioning layout is {MAJOR}.{MINOR}.{PATCH}-{INDICATOR}[.{PATCH}]. Only milestones and release candidates can have patch versions. Some examples: + +1.2.3.BUILD-SNAPSHOT +1.3.5.M.1 +1.5.7.RC.2 +2.0.0.RELEASE + +## License +See [LICENSE](LICENSE) file.
[fineract-cn-notifications] 27/43: Message Templating
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 13a1f550593b36b72714433d45e431781e83e7eb Author: Ebenezer Graham AuthorDate: Fri May 24 16:46:20 2019 +0400 Message Templating --- .../client/ConfigurationAlreadyExistException.java | 14 +- .../api/v1/client/NotificationManager.java | 11 +- .../v1/client/TemplateAlreadyExistException.java | 14 +- .../api/v1/client/TemplateNotFoundException.java | 14 +- .../cn/notification/api/v1/domain/Template.java| 110 + .../api/v1/events/NotificationEventConstants.java | 3 + component-test/build.gradle| 4 +- .../cn/notification/AbstractNotificationTest.java | 11 +- .../fineract/cn/notification/TestEmailService.java | 88 ++-- .../fineract/cn/notification/TestSMSService.java | 4 +- .../apache/fineract/cn/notification/TestSuite.java | 5 +- .../notification/importer/TestTemplateImport.java | 57 +++ .../main/resources/importdata/test-templates.csv | 20 + component-test/src/main/resources/logback-test.xml | 35 ++ .../src/main/resources/templates/template.html | 457 + service/build.gradle | 5 +- .../CreateTemplateCommand.java}| 34 +- ...andHandler.java => TemplateCommandHandler.java} | 56 +-- .../internal/config/NotificationConfiguration.java | 33 +- .../internal/importer/TemplateImporter.java| 92 + .../internal/mapper/EmailConfigurationMapper.java | 4 + .../service/internal/mapper/TemplateMapper.java| 51 +++ .../internal/repository/ApplicationEntity.java | 106 - .../EmailGatewayConfigurationRepository.java | 4 +- .../SMSGatewayConfigurationRepository.java | 4 +- .../internal/repository/TemplateEntity.java| 56 ++- .../internal/repository/TemplateRepository.java| 8 +- .../service/internal/service/EmailService.java | 138 +++ .../internal/service/NotificationService.java | 34 +- .../service/internal/service/SMSService.java | 18 +- .../service/internal/service/TemplateService.java | 60 +++ .../service/internal/service/util/MailBuilder.java | 36 +- .../service/listener/CustomerEventListener.java| 89 ++-- .../service/rest/EmailServiceRestController.java | 4 +- .../service/rest/SMSServiceRestController.java | 4 +- ...Controller.java => TemplateRestController.java} | 58 ++- service/src/main/resources/application.yml | 4 + .../db/migrations/mariadb/V1__initial_setup.sql| 24 +- .../main/resources/templatedetails/templates.csv | 28 ++ service/src/main/resources/templates/template.html | 457 + shared.gradle | 4 +- 41 files changed, 1784 insertions(+), 474 deletions(-) diff --git a/component-test/src/main/java/org/apache/fineract/cn/notification/TestSuite.java b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/ConfigurationAlreadyExistException.java similarity index 71% copy from component-test/src/main/java/org/apache/fineract/cn/notification/TestSuite.java copy to api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/ConfigurationAlreadyExistException.java index ad4208a..cf06584 100644 --- a/component-test/src/main/java/org/apache/fineract/cn/notification/TestSuite.java +++ b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/ConfigurationAlreadyExistException.java @@ -16,17 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.fineract.cn.notification; +package org.apache.fineract.cn.notification.api.v1.client; -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith(Suite.class) -@Suite.SuiteClasses({ - TestEmailService.class, - TestSMSService.class, - EmailApiDocumentation.class, - SmsApiDocumentation.class, -}) -public class TestSuite extends SuiteTestEnvironment { +public final class ConfigurationAlreadyExistException extends RuntimeException { } diff --git a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java index 8b6c76c..992a5bb 100644 --- a/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java +++ b/api/src/main/java/org/apache/fineract/cn/notification/api/v1/client/NotificationManager.java @@ -23,6 +23,7 @@ import org.apache.fineract.cn.api.annotation.ThrowsExceptions; import org.apache.fineract.cn.api.util.CustomFeignClientsConfiguration; import org.apache.fineract.cn.notification.api.v1.domain.EmailConfiguration; import org.apache.fineract.cn.notification.
[fineract-cn-notifications] 31/43: Merge branch 'develop' into permitted-feign-client-auth
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 76605f390124d5a250323eb27ad1ef39b608d8eb Merge: 76e9930 044d72f Author: Ebenezer Graham AuthorDate: Sat Jun 1 19:57:04 2019 +0400 Merge branch 'develop' into permitted-feign-client-auth Dockerfile| 4 ++-- shared.gradle | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-)
[fineract-cn-notifications] 10/43: test
This is an automated email from the ASF dual-hosted git repository. ikamga pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-notifications.git commit 041ec3473717bfa0d45ca7f73cbafa4634e7bdb5 Author: Ebenezer Graham AuthorDate: Fri Jun 15 04:04:00 2018 +0400 test --- .../service/listener/OfficeEventListener.java | 48 ++ 1 file changed, 32 insertions(+), 16 deletions(-) diff --git a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java index c77510e..9f083c5 100644 --- a/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java +++ b/service/src/main/java/org/apache/fineract/cn/notification/service/listener/OfficeEventListener.java @@ -16,12 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -/* + package org.apache.fineract.cn.notification.service.listener; -import org.apache.fineract.cn.accounting.api.v1.EventConstants; +import org.apache.fineract.cn.notification.service.internal.service.EmailSender; +import org.apache.fineract.cn.notification.service.internal.service.SMSSender; +import org.apache.fineract.cn.office.api.v1.EventConstants; import org.apache.fineract.cn.lang.config.TenantHeaderFilter; -import org.apache.fineract.cn.test.listener.EventRecorder; +import org.apache.fineract.cn.office.api.v1.client.OrganizationManager; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jms.annotation.JmsListener; import org.springframework.messaging.handler.annotation.Header; @@ -30,15 +32,35 @@ import org.springframework.stereotype.Component; @Component public class OfficeEventListener { -private final EventRecorder eventRecorder; + private OrganizationManager organizationManager; + private SMSSender smsSender; + private EmailSender emailSender; -@Autowired -public OfficeEventListener(final EventRecorder eventRecorder) { -super(); -this.eventRecorder = eventRecorder; -} + @Autowired + public OfficeEventListener(final OrganizationManager organizationManager, SMSSender smsSender, + final EmailSender emailSender) { + this.organizationManager = organizationManager; + this.smsSender = smsSender; + this.emailSender = emailSender; + } -@JmsListener( + @JmsListener( + subscription = EventConstants.DESTINATION, + destination = EventConstants.DESTINATION, + selector = EventConstants.SELECTOR_POST_OFFICE + ) + public void onCreateOffice(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, + final String payload) { + //for testing purposes + String office = this.organizationManager.findOfficeByIdentifier(payload).getName(); + if (office.equalsIgnoreCase("Head Office")) { + smsSender.sendSMS("+23058409206", "Test From Demo"); + } + } +} + +/* + @JmsListener( subscription = EventConstants.DESTINATION, destination = EventConstants.DESTINATION, selector = EventConstants.SELECTOR_POST_EMPLOYEE @@ -88,12 +110,6 @@ public class OfficeEventListener { this.eventRecorder.event(tenant, EventConstants.OPERATION_DELETE_CONTACT_DETAIL, eventPayload, String.class); } -public void onCreateOffice(@Header(TenantHeaderFilter.TENANT_HEADER) final String tenant, - final String payload) -throws Exception { -this.eventRecorder.event(tenant, EventConstants.OPERATION_POST_OFFICE, payload, String.class); -} - @JmsListener( subscription = EventConstants.DESTINATION, destination = EventConstants.DESTINATION,