This is an automated email from the ASF dual-hosted git repository.
vorburger pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new c97f0f9 FINERACT-821 Added and Enforced OperatorWrap Checkstyle
c97f0f9 is described below
commit c97f0f9935506ef68febbf64be2e5bda1219c963
Author: thesmallstar <[email protected]>
AuthorDate: Mon Jun 15 04:37:04 2020 +0530
FINERACT-821 Added and Enforced OperatorWrap Checkstyle
---
fineract-provider/config/checkstyle/checkstyle.xml | 9 +++++----
.../fineract/mix/service/XBRLResultServiceImpl.java | 16 ++++++++--------
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/fineract-provider/config/checkstyle/checkstyle.xml
b/fineract-provider/config/checkstyle/checkstyle.xml
index 3a66d96..e53631e 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -69,6 +69,10 @@
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules"
value="STATIC###THIRD_PARTY_PACKAGE"/>
</module>
+ <module name="OperatorWrap">
+ <property name="option" value="NL"/>
+ <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL,
GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS,
QUESTION, SL, SR, STAR "/>
+ </module>
<module
name="com.github.sevntu.checkstyle.checks.coding.ForbidCertainImportsCheck">
<property name="packageNameRegexp" value=".*" />
<property name="forbiddenImportsRegexp"
value="com.google.common.base.Charsets" />
@@ -242,10 +246,7 @@
<module name="VariableDeclarationUsageDistance"/>
<module name="MethodParamPad"/>
- <module name="OperatorWrap">
- <property name="option" value="NL"/>
- <property name="tokens" value="BAND, BOR, BSR, BXOR, DIV, EQUAL,
GE, GT, LAND, LE, LITERAL_INSTANCEOF, LOR, LT, MINUS, MOD, NOT_EQUAL, PLUS,
QUESTION, SL, SR, STAR "/>
- </module>
+
<! - - Enable some JavaDoc validation (requires quite a lot of manual
clean up work; not a top priority for initial Checkstyle adoption - ->
<module name="JavadocTagContinuationIndentation"/>
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java
index 2b5d2ea..7350876 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/mix/service/XBRLResultServiceImpl.java
@@ -99,36 +99,36 @@ public class XBRLResultServiceImpl implements
XBRLResultService {
+ "from (select acc_gl_account.gl_code as
'glcode',name,sum(amount) as 'debitamount' "
+ "from acc_gl_journal_entry,acc_gl_account " + "where
acc_gl_account.id = acc_gl_journal_entry.account_id "
+ "and acc_gl_journal_entry.type_enum=2 " + "and
acc_gl_journal_entry.entry_date <= " + endDate
- + " and acc_gl_journal_entry.entry_date > " + startDate +
+ + " and acc_gl_journal_entry.entry_date > " + startDate
// "and (acc_gl_journal_entry.office_id=${branch} or
// ${branch}=1) "
// +
- " group by glcode " + "order by glcode) debits " + "LEFT OUTER
JOIN "
+ + " group by glcode " + "order by glcode) debits " + "LEFT
OUTER JOIN "
+ "(select acc_gl_account.gl_code as 'glcode',name,sum(amount)
as 'creditamount' "
+ "from acc_gl_journal_entry,acc_gl_account " + "where
acc_gl_account.id = acc_gl_journal_entry.account_id "
+ "and acc_gl_journal_entry.type_enum=1 " + "and
acc_gl_journal_entry.entry_date <= " + endDate
- + " and acc_gl_journal_entry.entry_date > " + startDate +
+ + " and acc_gl_journal_entry.entry_date > " + startDate
// "and (acc_gl_journal_entry.office_id=${branch} or
// ${branch}=1) "
// +
- " group by glcode " + "order by glcode) credits " + "on
debits.glcode=credits.glcode " + "union "
+ + " group by glcode " + "order by glcode) credits " + "on
debits.glcode=credits.glcode " + "union "
+ "select credits.glcode as 'glcode', credits.name as 'name',
(ifnull(debits.debitamount,0)-ifnull(credits.creditamount,0)) as 'balance' "
+ "from (select acc_gl_account.gl_code as
'glcode',name,sum(amount) as 'debitamount' "
+ "from acc_gl_journal_entry,acc_gl_account " + "where
acc_gl_account.id = acc_gl_journal_entry.account_id "
+ "and acc_gl_journal_entry.type_enum=2 " + "and
acc_gl_journal_entry.entry_date <= " + endDate
- + " and acc_gl_journal_entry.entry_date > " + startDate +
+ + " and acc_gl_journal_entry.entry_date > " + startDate
// "and (acc_gl_journal_entry.office_id=${branch} or
// ${branch}=1) "
// +
- " group by glcode " + "order by glcode) debits " + "RIGHT
OUTER JOIN "
+ + " group by glcode " + "order by glcode) debits " + "RIGHT
OUTER JOIN "
+ "(select acc_gl_account.gl_code as 'glcode',name,sum(amount)
as 'creditamount' "
+ "from acc_gl_journal_entry,acc_gl_account " + "where
acc_gl_account.id = acc_gl_journal_entry.account_id "
+ "and acc_gl_journal_entry.type_enum=1 " + "and
acc_gl_journal_entry.entry_date <= " + endDate
- + " and acc_gl_journal_entry.entry_date > " + startDate +
+ + " and acc_gl_journal_entry.entry_date > " + startDate
// "and (acc_gl_journal_entry.office_id=${branch} or
// ${branch}=1) "
// +
- " group by name, glcode " + "order by glcode) credits " + "on
debits.glcode=credits.glcode;";
+ + " group by name, glcode " + "order by glcode) credits " +
"on debits.glcode=credits.glcode;";
return sql;
}
