This is an automated email from the ASF dual-hosted git repository. awasum pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract-cn-reporting.git
commit e4cccd465604c3eb241ca81bc7198f4fba6938bc Author: Myrle Krantz <[email protected]> AuthorDate: Mon Apr 16 15:13:10 2018 +0200 Change package names from mifos to apache fineract. --- .../cn}/reporting/api/v1/EventConstants.java | 2 +- .../cn}/reporting/api/v1/PermittableGroupIds.java | 2 +- .../cn}/reporting/api/v1/client/ReportManager.java | 8 ++--- .../api/v1/client/ReportNotFoundException.java | 2 +- .../client/ReportParameterValidationException.java | 2 +- .../api/v1/domain/AutoCompleteResource.java | 2 +- .../reporting/api/v1/domain/DisplayableField.java | 2 +- .../cn}/reporting/api/v1/domain/Footer.java | 2 +- .../cn}/reporting/api/v1/domain/Header.java | 2 +- .../reporting/api/v1/domain/QueryParameter.java | 2 +- .../reporting/api/v1/domain/ReportDefinition.java | 2 +- .../cn}/reporting/api/v1/domain/ReportPage.java | 2 +- .../cn}/reporting/api/v1/domain/ReportRequest.java | 2 +- .../fineract/cn}/reporting/api/v1/domain/Row.java | 2 +- .../fineract/cn}/reporting/api/v1/domain/Type.java | 2 +- .../cn}/reporting/api/v1/domain/Value.java | 2 +- .../AbstractReportingSpecificationTest.java | 8 ++--- .../TestBalanceSheetReportSpecification.java | 4 +-- .../TestCustomerListReportSpecification.java | 4 +-- .../TestDepositListReportSpecification.java | 4 +-- .../TestIncomeStatementReportSpecification.java | 4 +-- .../reporting/TestLoanListReportSpecification.java | 4 +-- .../TestTellerListReportSpecification.java | 4 +-- .../TestTellerTransactionReportSpecification.java | 4 +-- .../reporting/service/ReportingApplication.java | 2 +- .../reporting/service/ReportingConfiguration.java | 9 +++--- .../cn}/reporting/service/ServiceConstants.java | 2 +- .../provider/ReportSpecificationProvider.java | 10 +++---- .../service/internal/repository/DummyEntity.java | 2 +- .../internal/repository/DummyRepository.java | 2 +- .../BalanceSheetReportSpecification.java | 30 +++++++++---------- .../CustomerListReportSpecification.java | 34 +++++++++++----------- .../DepositListReportSpecification.java | 34 +++++++++++----------- .../IncomeStatementReportSpecification.java | 30 +++++++++---------- .../specification/LoanListReportSpecification.java | 32 ++++++++++---------- .../OfficeListReportSpecification.java | 32 ++++++++++---------- .../TellerListReportSpecification.java | 34 +++++++++++----------- .../TellerTransactionReportSpecification.java | 34 +++++++++++----------- .../service/rest/ReportingRestController.java | 18 ++++++------ .../cn}/reporting/service/spi/CriteriaBuilder.java | 4 +-- .../service/spi/DisplayableFieldBuilder.java | 6 ++-- .../service/spi/QueryParameterBuilder.java | 8 ++--- .../fineract/cn}/reporting/service/spi/Report.java | 2 +- .../reporting/service/spi/ReportSpecification.java | 8 ++--- 44 files changed, 204 insertions(+), 203 deletions(-) diff --git a/api/src/main/java/io/mifos/reporting/api/v1/EventConstants.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/EventConstants.java similarity index 95% rename from api/src/main/java/io/mifos/reporting/api/v1/EventConstants.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/EventConstants.java index c274750..85bcc82 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/EventConstants.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/EventConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1; +package org.apache.fineract.cn.reporting.api.v1; @SuppressWarnings("unused") public interface EventConstants { diff --git a/api/src/main/java/io/mifos/reporting/api/v1/PermittableGroupIds.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/PermittableGroupIds.java similarity index 95% rename from api/src/main/java/io/mifos/reporting/api/v1/PermittableGroupIds.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/PermittableGroupIds.java index b3363a3..8a46016 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/PermittableGroupIds.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/PermittableGroupIds.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1; +package org.apache.fineract.cn.reporting.api.v1; @SuppressWarnings("unused") public interface PermittableGroupIds { diff --git a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportManager.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportManager.java similarity index 93% rename from api/src/main/java/io/mifos/reporting/api/v1/client/ReportManager.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportManager.java index 0bcd6af..8cf82d5 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportManager.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportManager.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.client; +package org.apache.fineract.cn.reporting.api.v1.client; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; import java.util.List; import org.apache.fineract.cn.api.annotation.ThrowsException; import org.apache.fineract.cn.api.annotation.ThrowsExceptions; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportNotFoundException.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportNotFoundException.java similarity index 93% rename from api/src/main/java/io/mifos/reporting/api/v1/client/ReportNotFoundException.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportNotFoundException.java index dc1ea5a..e508e73 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportNotFoundException.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportNotFoundException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.client; +package org.apache.fineract.cn.reporting.api.v1.client; public class ReportNotFoundException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportParameterValidationException.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportParameterValidationException.java similarity index 94% rename from api/src/main/java/io/mifos/reporting/api/v1/client/ReportParameterValidationException.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportParameterValidationException.java index 52a7b1e..e60b5da 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportParameterValidationException.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/client/ReportParameterValidationException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.client; +package org.apache.fineract.cn.reporting.api.v1.client; public class ReportParameterValidationException extends RuntimeException { } diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/AutoCompleteResource.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/AutoCompleteResource.java similarity index 95% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/AutoCompleteResource.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/AutoCompleteResource.java index b72db87..9594d2c 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/AutoCompleteResource.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/AutoCompleteResource.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; import java.util.List; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/DisplayableField.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/DisplayableField.java similarity index 96% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/DisplayableField.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/DisplayableField.java index 5a11707..8942a58 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/DisplayableField.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/DisplayableField.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; public class DisplayableField { diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/Footer.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Footer.java similarity index 95% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/Footer.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Footer.java index 06bc5d2..951e160 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/Footer.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Footer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; import java.util.List; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/Header.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Header.java similarity index 95% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/Header.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Header.java index b2eca21..370e743 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/Header.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Header.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; import java.util.List; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/QueryParameter.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/QueryParameter.java similarity index 97% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/QueryParameter.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/QueryParameter.java index ba03e8b..4330edb 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/QueryParameter.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/QueryParameter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; public class QueryParameter { diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/ReportDefinition.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportDefinition.java similarity index 97% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/ReportDefinition.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportDefinition.java index 898252c..c75b5cb 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/ReportDefinition.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportDefinition.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; import java.util.List; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/ReportPage.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportPage.java similarity index 97% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/ReportPage.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportPage.java index 5720e5d..e73478e 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/ReportPage.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportPage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; import java.util.List; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/ReportRequest.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportRequest.java similarity index 96% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/ReportRequest.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportRequest.java index 596574b..db46a72 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/ReportRequest.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/ReportRequest.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; import java.util.List; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/Row.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Row.java similarity index 95% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/Row.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Row.java index 22e631d..7db5c62 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/Row.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Row.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; import java.util.List; diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/Type.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Type.java similarity index 93% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/Type.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Type.java index 45abcf3..ff66347 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/Type.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Type.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; public enum Type { TEXT, diff --git a/api/src/main/java/io/mifos/reporting/api/v1/domain/Value.java b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Value.java similarity index 95% rename from api/src/main/java/io/mifos/reporting/api/v1/domain/Value.java rename to api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Value.java index d9c1b6a..ff904b8 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/domain/Value.java +++ b/api/src/main/java/org/apache/fineract/cn/reporting/api/v1/domain/Value.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.api.v1.domain; +package org.apache.fineract.cn.reporting.api.v1.domain; public class Value { diff --git a/component-test/src/main/java/io/mifos/reporting/AbstractReportingSpecificationTest.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/AbstractReportingSpecificationTest.java similarity index 94% rename from component-test/src/main/java/io/mifos/reporting/AbstractReportingSpecificationTest.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/AbstractReportingSpecificationTest.java index b6d3012..528bad0 100644 --- a/component-test/src/main/java/io/mifos/reporting/AbstractReportingSpecificationTest.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/AbstractReportingSpecificationTest.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.client.ReportManager; -import io.mifos.reporting.service.ReportingConfiguration; +import org.apache.fineract.cn.reporting.api.v1.client.ReportManager; +import org.apache.fineract.cn.reporting.service.ReportingConfiguration; import java.security.interfaces.RSAPrivateKey; import org.apache.fineract.cn.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; import org.apache.fineract.cn.api.context.AutoUserContext; @@ -57,7 +57,7 @@ public class AbstractReportingSpecificationTest { public static final String LOGGER_NAME = "test-logger"; @Configuration - @EnableFeignClients(basePackages = {"io.mifos.reporting.api.v1.client"}) + @EnableFeignClients(basePackages = {"org.apache.fineract.cn.reporting.api.v1.client"}) @RibbonClient(name = APP_NAME) @Import({ReportingConfiguration.class}) public static class TestConfiguration { diff --git a/component-test/src/main/java/io/mifos/reporting/TestBalanceSheetReportSpecification.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestBalanceSheetReportSpecification.java similarity index 92% rename from component-test/src/main/java/io/mifos/reporting/TestBalanceSheetReportSpecification.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/TestBalanceSheetReportSpecification.java index a64b19c..d8ae817 100644 --- a/component-test/src/main/java/io/mifos/reporting/TestBalanceSheetReportSpecification.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestBalanceSheetReportSpecification.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; import org.junit.Assert; import org.junit.Test; diff --git a/component-test/src/main/java/io/mifos/reporting/TestCustomerListReportSpecification.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestCustomerListReportSpecification.java similarity index 92% rename from component-test/src/main/java/io/mifos/reporting/TestCustomerListReportSpecification.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/TestCustomerListReportSpecification.java index fdef649..7fdae97 100644 --- a/component-test/src/main/java/io/mifos/reporting/TestCustomerListReportSpecification.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestCustomerListReportSpecification.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; import org.junit.Assert; import org.junit.Test; diff --git a/component-test/src/main/java/io/mifos/reporting/TestDepositListReportSpecification.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestDepositListReportSpecification.java similarity index 92% rename from component-test/src/main/java/io/mifos/reporting/TestDepositListReportSpecification.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/TestDepositListReportSpecification.java index 092b365..d13fcf6 100644 --- a/component-test/src/main/java/io/mifos/reporting/TestDepositListReportSpecification.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestDepositListReportSpecification.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; import org.junit.Assert; import org.junit.Test; diff --git a/component-test/src/main/java/io/mifos/reporting/TestIncomeStatementReportSpecification.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestIncomeStatementReportSpecification.java similarity index 92% rename from component-test/src/main/java/io/mifos/reporting/TestIncomeStatementReportSpecification.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/TestIncomeStatementReportSpecification.java index f65dfe6..d919828 100644 --- a/component-test/src/main/java/io/mifos/reporting/TestIncomeStatementReportSpecification.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestIncomeStatementReportSpecification.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; import org.junit.Assert; import org.junit.Test; diff --git a/component-test/src/main/java/io/mifos/reporting/TestLoanListReportSpecification.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestLoanListReportSpecification.java similarity index 92% rename from component-test/src/main/java/io/mifos/reporting/TestLoanListReportSpecification.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/TestLoanListReportSpecification.java index 346444b..49075cf 100644 --- a/component-test/src/main/java/io/mifos/reporting/TestLoanListReportSpecification.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestLoanListReportSpecification.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; import org.junit.Assert; import org.junit.Test; diff --git a/component-test/src/main/java/io/mifos/reporting/TestTellerListReportSpecification.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestTellerListReportSpecification.java similarity index 92% rename from component-test/src/main/java/io/mifos/reporting/TestTellerListReportSpecification.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/TestTellerListReportSpecification.java index 419f0f2..fe3d2f4 100644 --- a/component-test/src/main/java/io/mifos/reporting/TestTellerListReportSpecification.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestTellerListReportSpecification.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; import org.junit.Assert; import org.junit.Test; diff --git a/component-test/src/main/java/io/mifos/reporting/TestTellerTransactionReportSpecification.java b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestTellerTransactionReportSpecification.java similarity index 92% rename from component-test/src/main/java/io/mifos/reporting/TestTellerTransactionReportSpecification.java rename to component-test/src/main/java/org/apache/fineract/cn/reporting/TestTellerTransactionReportSpecification.java index 75eba2b..fb76bc3 100644 --- a/component-test/src/main/java/io/mifos/reporting/TestTellerTransactionReportSpecification.java +++ b/component-test/src/main/java/org/apache/fineract/cn/reporting/TestTellerTransactionReportSpecification.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting; +package org.apache.fineract.cn.reporting; -import io.mifos.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; import org.junit.Assert; import org.junit.Test; diff --git a/service/src/main/java/io/mifos/reporting/service/ReportingApplication.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingApplication.java similarity index 95% rename from service/src/main/java/io/mifos/reporting/service/ReportingApplication.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingApplication.java index 02b0d84..b753877 100644 --- a/service/src/main/java/io/mifos/reporting/service/ReportingApplication.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingApplication.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service; +package org.apache.fineract.cn.reporting.service; import org.springframework.boot.SpringApplication; diff --git a/service/src/main/java/io/mifos/reporting/service/ReportingConfiguration.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingConfiguration.java similarity index 90% rename from service/src/main/java/io/mifos/reporting/service/ReportingConfiguration.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingConfiguration.java index 77310e3..bc71177 100644 --- a/service/src/main/java/io/mifos/reporting/service/ReportingConfiguration.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/ReportingConfiguration.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service; +package org.apache.fineract.cn.reporting.service; import org.apache.fineract.cn.anubis.config.EnableAnubis; import org.apache.fineract.cn.cassandra.config.EnableCassandra; @@ -47,10 +47,11 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter @EnableMariaDB @EnableAnubis @EnableServiceException -@EnableJpaRepositories(basePackages = { "io.mifos.reporting.service.internal.repository" }) +@EnableJpaRepositories(basePackages = { + "org.apache.fineract.cn.reporting.service.internal.repository"}) @ComponentScan({ - "io.mifos.reporting.service.rest", - "io.mifos.reporting.service.internal" + "org.apache.fineract.cn.reporting.service.rest", + "org.apache.fineract.cn.reporting.service.internal" }) public class ReportingConfiguration extends WebMvcConfigurerAdapter { diff --git a/service/src/main/java/io/mifos/reporting/service/ServiceConstants.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/ServiceConstants.java similarity index 94% rename from service/src/main/java/io/mifos/reporting/service/ServiceConstants.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/ServiceConstants.java index b5cb983..ccceb46 100644 --- a/service/src/main/java/io/mifos/reporting/service/ServiceConstants.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/ServiceConstants.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service; +package org.apache.fineract.cn.reporting.service; public interface ServiceConstants { String LOGGER_NAME = "reporting-logger"; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/provider/ReportSpecificationProvider.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/provider/ReportSpecificationProvider.java similarity index 93% rename from service/src/main/java/io/mifos/reporting/service/internal/provider/ReportSpecificationProvider.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/provider/ReportSpecificationProvider.java index f6393ff..da21c30 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/provider/ReportSpecificationProvider.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/provider/ReportSpecificationProvider.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.provider; +package org.apache.fineract.cn.reporting.service.internal.provider; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import org.slf4j.Logger; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/repository/DummyEntity.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/repository/DummyEntity.java similarity index 93% rename from service/src/main/java/io/mifos/reporting/service/internal/repository/DummyEntity.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/repository/DummyEntity.java index 05e080a..670ab5d 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/repository/DummyEntity.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/repository/DummyEntity.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.repository; +package org.apache.fineract.cn.reporting.service.internal.repository; import javax.persistence.Entity; import javax.persistence.Id; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/repository/DummyRepository.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/repository/DummyRepository.java similarity index 93% rename from service/src/main/java/io/mifos/reporting/service/internal/repository/DummyRepository.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/repository/DummyRepository.java index bdca566..f5640f3 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/repository/DummyRepository.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/repository/DummyRepository.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.repository; +package org.apache.fineract.cn.reporting.service.internal.repository; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/BalanceSheetReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/BalanceSheetReportSpecification.java similarity index 93% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/BalanceSheetReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/BalanceSheetReportSpecification.java index 0723acc..17f32cf 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/BalanceSheetReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/BalanceSheetReportSpecification.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.math.BigDecimal; import java.time.Clock; import java.time.LocalDateTime; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/CustomerListReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/CustomerListReportSpecification.java similarity index 92% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/CustomerListReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/CustomerListReportSpecification.java index cee7ee2..cb654fb 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/CustomerListReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/CustomerListReportSpecification.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.CriteriaBuilder; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.QueryParameterBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.CriteriaBuilder; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.QueryParameterBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.text.DecimalFormat; import java.time.Clock; import java.time.LocalDateTime; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/DepositListReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/DepositListReportSpecification.java similarity index 94% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/DepositListReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/DepositListReportSpecification.java index 1cdfd8e..24fb94b 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/DepositListReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/DepositListReportSpecification.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.CriteriaBuilder; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.QueryParameterBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.CriteriaBuilder; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.QueryParameterBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/IncomeStatementReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/IncomeStatementReportSpecification.java similarity index 92% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/IncomeStatementReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/IncomeStatementReportSpecification.java index eb76f70..2b54880 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/IncomeStatementReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/IncomeStatementReportSpecification.java @@ -16,21 +16,21 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.math.BigDecimal; import java.time.Clock; import java.time.LocalDateTime; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/LoanListReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/LoanListReportSpecification.java similarity index 93% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/LoanListReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/LoanListReportSpecification.java index f747322..457fe64 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/LoanListReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/LoanListReportSpecification.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.CriteriaBuilder; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.CriteriaBuilder; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/OfficeListReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/OfficeListReportSpecification.java similarity index 92% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/OfficeListReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/OfficeListReportSpecification.java index b9abe66..fdbb6e9 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/OfficeListReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/OfficeListReportSpecification.java @@ -16,22 +16,22 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.CriteriaBuilder; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.CriteriaBuilder; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerListReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/TellerListReportSpecification.java similarity index 89% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/TellerListReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/TellerListReportSpecification.java index bfdf746..2652f9b 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerListReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/TellerListReportSpecification.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.CriteriaBuilder; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.QueryParameterBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.CriteriaBuilder; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.QueryParameterBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerTransactionReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/TellerTransactionReportSpecification.java similarity index 93% rename from service/src/main/java/io/mifos/reporting/service/internal/specification/TellerTransactionReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/TellerTransactionReportSpecification.java index 3bbb4b6..b797fd5 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerTransactionReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/internal/specification/TellerTransactionReportSpecification.java @@ -16,23 +16,23 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.internal.specification; - -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Header; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.api.v1.domain.Row; -import io.mifos.reporting.api.v1.domain.Type; -import io.mifos.reporting.api.v1.domain.Value; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.spi.CriteriaBuilder; -import io.mifos.reporting.service.spi.DisplayableFieldBuilder; -import io.mifos.reporting.service.spi.QueryParameterBuilder; -import io.mifos.reporting.service.spi.Report; -import io.mifos.reporting.service.spi.ReportSpecification; +package org.apache.fineract.cn.reporting.service.internal.specification; + +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Header; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.Row; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.Value; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.spi.CriteriaBuilder; +import org.apache.fineract.cn.reporting.service.spi.DisplayableFieldBuilder; +import org.apache.fineract.cn.reporting.service.spi.QueryParameterBuilder; +import org.apache.fineract.cn.reporting.service.spi.Report; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; diff --git a/service/src/main/java/io/mifos/reporting/service/rest/ReportingRestController.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/rest/ReportingRestController.java similarity index 91% rename from service/src/main/java/io/mifos/reporting/service/rest/ReportingRestController.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/rest/ReportingRestController.java index 310dbfa..49691a6 100644 --- a/service/src/main/java/io/mifos/reporting/service/rest/ReportingRestController.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/rest/ReportingRestController.java @@ -16,18 +16,18 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.rest; +package org.apache.fineract.cn.reporting.service.rest; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.mifos.reporting.api.v1.EventConstants; -import io.mifos.reporting.api.v1.PermittableGroupIds; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; -import io.mifos.reporting.service.ServiceConstants; -import io.mifos.reporting.service.internal.provider.ReportSpecificationProvider; -import io.mifos.reporting.service.spi.ReportSpecification; +import org.apache.fineract.cn.reporting.api.v1.EventConstants; +import org.apache.fineract.cn.reporting.api.v1.PermittableGroupIds; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.service.ServiceConstants; +import org.apache.fineract.cn.reporting.service.internal.provider.ReportSpecificationProvider; +import org.apache.fineract.cn.reporting.service.spi.ReportSpecification; import java.util.List; import java.util.Optional; import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; diff --git a/service/src/main/java/io/mifos/reporting/service/spi/CriteriaBuilder.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/CriteriaBuilder.java similarity index 96% rename from service/src/main/java/io/mifos/reporting/service/spi/CriteriaBuilder.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/spi/CriteriaBuilder.java index 30a2c09..3ef8002 100644 --- a/service/src/main/java/io/mifos/reporting/service/spi/CriteriaBuilder.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/CriteriaBuilder.java @@ -16,9 +16,9 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.spi; +package org.apache.fineract.cn.reporting.service.spi; -import io.mifos.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; import org.owasp.esapi.ESAPI; import org.owasp.esapi.Encoder; import org.owasp.esapi.codecs.MySQLCodec; diff --git a/service/src/main/java/io/mifos/reporting/service/spi/DisplayableFieldBuilder.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/DisplayableFieldBuilder.java similarity index 89% rename from service/src/main/java/io/mifos/reporting/service/spi/DisplayableFieldBuilder.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/spi/DisplayableFieldBuilder.java index eba5094..4a089e3 100644 --- a/service/src/main/java/io/mifos/reporting/service/spi/DisplayableFieldBuilder.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/DisplayableFieldBuilder.java @@ -16,10 +16,10 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.spi; +package org.apache.fineract.cn.reporting.service.spi; -import io.mifos.reporting.api.v1.domain.DisplayableField; -import io.mifos.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.DisplayableField; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; public class DisplayableFieldBuilder { diff --git a/service/src/main/java/io/mifos/reporting/service/spi/QueryParameterBuilder.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/QueryParameterBuilder.java similarity index 90% rename from service/src/main/java/io/mifos/reporting/service/spi/QueryParameterBuilder.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/spi/QueryParameterBuilder.java index 23eece5..aade86e 100644 --- a/service/src/main/java/io/mifos/reporting/service/spi/QueryParameterBuilder.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/QueryParameterBuilder.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.spi; +package org.apache.fineract.cn.reporting.service.spi; -import io.mifos.reporting.api.v1.domain.AutoCompleteResource; -import io.mifos.reporting.api.v1.domain.QueryParameter; -import io.mifos.reporting.api.v1.domain.Type; +import org.apache.fineract.cn.reporting.api.v1.domain.AutoCompleteResource; +import org.apache.fineract.cn.reporting.api.v1.domain.QueryParameter; +import org.apache.fineract.cn.reporting.api.v1.domain.Type; import java.util.Arrays; diff --git a/service/src/main/java/io/mifos/reporting/service/spi/Report.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/Report.java similarity index 95% rename from service/src/main/java/io/mifos/reporting/service/spi/Report.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/spi/Report.java index 4268f0b..acc0f77 100644 --- a/service/src/main/java/io/mifos/reporting/service/spi/Report.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/Report.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.spi; +package org.apache.fineract.cn.reporting.service.spi; import org.springframework.stereotype.Component; diff --git a/service/src/main/java/io/mifos/reporting/service/spi/ReportSpecification.java b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/ReportSpecification.java similarity index 80% rename from service/src/main/java/io/mifos/reporting/service/spi/ReportSpecification.java rename to service/src/main/java/org/apache/fineract/cn/reporting/service/spi/ReportSpecification.java index 3511815..2fe0bd0 100644 --- a/service/src/main/java/io/mifos/reporting/service/spi/ReportSpecification.java +++ b/service/src/main/java/org/apache/fineract/cn/reporting/service/spi/ReportSpecification.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package io.mifos.reporting.service.spi; +package org.apache.fineract.cn.reporting.service.spi; -import io.mifos.reporting.api.v1.domain.ReportDefinition; -import io.mifos.reporting.api.v1.domain.ReportPage; -import io.mifos.reporting.api.v1.domain.ReportRequest; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportDefinition; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportPage; +import org.apache.fineract.cn.reporting.api.v1.domain.ReportRequest; public interface ReportSpecification {
