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 e6aec098f6ecadc99aa29c41ad8e0fdfdf470e1b Author: Myrle Krantz <[email protected]> AuthorDate: Mon Apr 16 15:07:08 2018 +0200 Adjusting to package name changes in upstream repositories. --- .../reporting/api/v1/client/ReportManager.java | 12 +++------ .../AbstractReportingSpecificationTest.java | 17 ++++++------ .../reporting/service/ReportingConfiguration.java | 14 +++++----- .../BalanceSheetReportSpecification.java | 27 ++++++++++++------- .../CustomerListReportSpecification.java | 15 +++++------ .../DepositListReportSpecification.java | 31 +++++++++++++++------- .../IncomeStatementReportSpecification.java | 27 ++++++++++++------- .../specification/LoanListReportSpecification.java | 30 ++++++++++++++------- .../OfficeListReportSpecification.java | 30 ++++++++++++++------- .../TellerListReportSpecification.java | 31 +++++++++++++++------- .../TellerTransactionReportSpecification.java | 31 +++++++++++++++------- .../service/rest/ReportingRestController.java | 17 ++++++------ 12 files changed, 173 insertions(+), 109 deletions(-) diff --git a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportManager.java b/api/src/main/java/io/mifos/reporting/api/v1/client/ReportManager.java index 4f78218..0bcd6af 100644 --- a/api/src/main/java/io/mifos/reporting/api/v1/client/ReportManager.java +++ b/api/src/main/java/io/mifos/reporting/api/v1/client/ReportManager.java @@ -18,26 +18,22 @@ */ package io.mifos.reporting.api.v1.client; -import io.mifos.core.api.annotation.ThrowsException; -import io.mifos.core.api.annotation.ThrowsExceptions; -import io.mifos.core.api.util.CustomFeignClientsConfiguration; -import io.mifos.core.lang.ServiceException; -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 java.util.List; +import org.apache.fineract.cn.api.annotation.ThrowsException; +import org.apache.fineract.cn.api.annotation.ThrowsExceptions; +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; -import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; -import java.util.List; - @SuppressWarnings("unused") @FeignClient(value="reporting-v1", path="/reporting/v1", configuration = CustomFeignClientsConfiguration.class) public interface ReportManager { diff --git a/component-test/src/main/java/io/mifos/reporting/AbstractReportingSpecificationTest.java b/component-test/src/main/java/io/mifos/reporting/AbstractReportingSpecificationTest.java index b6282d9..b6d3012 100644 --- a/component-test/src/main/java/io/mifos/reporting/AbstractReportingSpecificationTest.java +++ b/component-test/src/main/java/io/mifos/reporting/AbstractReportingSpecificationTest.java @@ -18,15 +18,16 @@ */ package io.mifos.reporting; -import io.mifos.anubis.test.v1.TenantApplicationSecurityEnvironmentTestRule; -import io.mifos.core.api.context.AutoUserContext; -import io.mifos.core.lang.ApplicationName; -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.reporting.api.v1.client.ReportManager; import io.mifos.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; +import org.apache.fineract.cn.lang.ApplicationName; +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.junit.After; import org.junit.Before; import org.junit.ClassRule; @@ -46,8 +47,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringRunner; -import java.security.interfaces.RSAPrivateKey; - @RunWith(SpringRunner.class) @SpringBootTest( webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT, diff --git a/service/src/main/java/io/mifos/reporting/service/ReportingConfiguration.java b/service/src/main/java/io/mifos/reporting/service/ReportingConfiguration.java index cf7708c..77310e3 100644 --- a/service/src/main/java/io/mifos/reporting/service/ReportingConfiguration.java +++ b/service/src/main/java/io/mifos/reporting/service/ReportingConfiguration.java @@ -18,13 +18,13 @@ */ package io.mifos.reporting.service; -import io.mifos.anubis.config.EnableAnubis; -import io.mifos.core.cassandra.config.EnableCassandra; -import io.mifos.core.command.config.EnableCommandProcessing; -import io.mifos.core.lang.config.EnableApplicationName; -import io.mifos.core.lang.config.EnableServiceException; -import io.mifos.core.lang.config.EnableTenantContext; -import io.mifos.core.mariadb.config.EnableMariaDB; +import org.apache.fineract.cn.anubis.config.EnableAnubis; +import org.apache.fineract.cn.cassandra.config.EnableCassandra; +import org.apache.fineract.cn.command.config.EnableCommandProcessing; +import org.apache.fineract.cn.lang.config.EnableApplicationName; +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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/BalanceSheetReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/BalanceSheetReportSpecification.java index aed5953..0723acc 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/BalanceSheetReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/BalanceSheetReportSpecification.java @@ -18,16 +18,19 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.reporting.api.v1.domain.*; +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.*; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; +import io.mifos.reporting.service.spi.DisplayableFieldBuilder; +import io.mifos.reporting.service.spi.Report; +import io.mifos.reporting.service.spi.ReportSpecification; import java.math.BigDecimal; import java.time.Clock; import java.time.LocalDateTime; @@ -36,6 +39,12 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Accounting", identifier = "Balancesheet") public class BalanceSheetReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/CustomerListReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/CustomerListReportSpecification.java index cbb45d6..cee7ee2 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/CustomerListReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/CustomerListReportSpecification.java @@ -18,8 +18,6 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; import io.mifos.reporting.api.v1.domain.DisplayableField; import io.mifos.reporting.api.v1.domain.Header; import io.mifos.reporting.api.v1.domain.QueryParameter; @@ -35,12 +33,6 @@ 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; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; import java.text.DecimalFormat; import java.time.Clock; import java.time.LocalDateTime; @@ -49,6 +41,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Customer", identifier = "Listing") public class CustomerListReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/DepositListReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/DepositListReportSpecification.java index 458a081..1cdfd8e 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/DepositListReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/DepositListReportSpecification.java @@ -18,17 +18,21 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.reporting.api.v1.domain.*; +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.*; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; +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; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; @@ -36,6 +40,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Deposit", identifier = "Listing") public class DepositListReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/IncomeStatementReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/IncomeStatementReportSpecification.java index 7f5c678..eb76f70 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/IncomeStatementReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/IncomeStatementReportSpecification.java @@ -18,16 +18,19 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.reporting.api.v1.domain.*; +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.*; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; +import io.mifos.reporting.service.spi.DisplayableFieldBuilder; +import io.mifos.reporting.service.spi.Report; +import io.mifos.reporting.service.spi.ReportSpecification; import java.math.BigDecimal; import java.time.Clock; import java.time.LocalDateTime; @@ -36,6 +39,12 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Accounting", identifier = "Incomestatement") public class IncomeStatementReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/LoanListReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/LoanListReportSpecification.java index 6017321..f747322 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/LoanListReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/LoanListReportSpecification.java @@ -18,17 +18,20 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.reporting.api.v1.domain.*; +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.*; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; +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; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; @@ -36,6 +39,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Loan", identifier = "Listing") public class LoanListReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/OfficeListReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/OfficeListReportSpecification.java index f1c118d..b9abe66 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/OfficeListReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/OfficeListReportSpecification.java @@ -18,17 +18,20 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.reporting.api.v1.domain.*; +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.*; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; +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; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; @@ -36,6 +39,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Organization", identifier = "Office") public class OfficeListReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerListReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerListReportSpecification.java index a00db8f..bfdf746 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerListReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerListReportSpecification.java @@ -18,17 +18,21 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.reporting.api.v1.domain.*; +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.*; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; +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; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; @@ -36,6 +40,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Teller" , identifier = "Listing") public class TellerListReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerTransactionReportSpecification.java b/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerTransactionReportSpecification.java index c196e92..3bbb4b6 100644 --- a/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerTransactionReportSpecification.java +++ b/service/src/main/java/io/mifos/reporting/service/internal/specification/TellerTransactionReportSpecification.java @@ -18,17 +18,21 @@ */ package io.mifos.reporting.service.internal.specification; -import io.mifos.core.api.util.UserContextHolder; -import io.mifos.core.lang.DateConverter; -import io.mifos.reporting.api.v1.domain.*; +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.*; -import org.slf4j.Logger; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; - -import javax.persistence.EntityManager; -import javax.persistence.Query; +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; import java.time.Clock; import java.time.LocalDateTime; import java.util.ArrayList; @@ -36,6 +40,13 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.stream.Collectors; +import javax.persistence.EntityManager; +import javax.persistence.Query; +import org.apache.fineract.cn.api.util.UserContextHolder; +import org.apache.fineract.cn.lang.DateConverter; +import org.slf4j.Logger; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; @Report(category = "Teller", identifier = "Transactions") public class TellerTransactionReportSpecification implements ReportSpecification { diff --git a/service/src/main/java/io/mifos/reporting/service/rest/ReportingRestController.java b/service/src/main/java/io/mifos/reporting/service/rest/ReportingRestController.java index 7970f8a..310dbfa 100644 --- a/service/src/main/java/io/mifos/reporting/service/rest/ReportingRestController.java +++ b/service/src/main/java/io/mifos/reporting/service/rest/ReportingRestController.java @@ -20,12 +20,6 @@ package io.mifos.reporting.service.rest; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import io.mifos.anubis.annotation.AcceptedTokenType; -import io.mifos.anubis.annotation.Permittable; -import io.mifos.core.lang.ApplicationName; -import io.mifos.core.lang.ServiceException; -import io.mifos.core.lang.TenantContextHolder; -import io.mifos.core.lang.config.TenantHeaderFilter; import io.mifos.reporting.api.v1.EventConstants; import io.mifos.reporting.api.v1.PermittableGroupIds; import io.mifos.reporting.api.v1.domain.ReportDefinition; @@ -34,6 +28,14 @@ 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 java.util.List; +import java.util.Optional; +import org.apache.fineract.cn.anubis.annotation.AcceptedTokenType; +import org.apache.fineract.cn.anubis.annotation.Permittable; +import org.apache.fineract.cn.lang.ApplicationName; +import org.apache.fineract.cn.lang.ServiceException; +import org.apache.fineract.cn.lang.TenantContextHolder; +import org.apache.fineract.cn.lang.config.TenantHeaderFilter; import org.slf4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -48,9 +50,6 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import java.util.Optional; - @SuppressWarnings("unused") @RestController @RequestMapping("/")
