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 31c69cf FINERACT-821 Added and Enforced GenericWhitespace Checkstyle
31c69cf is described below
commit 31c69cff39f68fd330216663922cb4bf8837cfa2
Author: thesmallstar <[email protected]>
AuthorDate: Mon Jun 15 02:00:14 2020 +0530
FINERACT-821 Added and Enforced GenericWhitespace Checkstyle
---
config/fineractdev-formatter.xml | 2 +-
fineract-provider/config/checkstyle/checkstyle.xml | 20 ++++++++++----------
.../fineract/integrationtests/common/HookHelper.java | 4 ++--
.../service/ReadWriteNonCoreDataServiceImpl.java | 2 +-
4 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/config/fineractdev-formatter.xml b/config/fineractdev-formatter.xml
index 2bbe4b7..b6f9ad2 100644
--- a/config/fineractdev-formatter.xml
+++ b/config/fineractdev-formatter.xml
@@ -100,7 +100,7 @@
<setting
id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for"
value="insert"/>
<setting
id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line"
value="one_line_if_empty"/>
<setting
id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body"
value="0"/>
- <setting
id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
value="insert"/>
+ <setting
id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments"
value="do not insert"/>
<setting
id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line"
value="false"/>
<setting
id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause"
value="common_lines"/>
<setting
id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
diff --git a/fineract-provider/config/checkstyle/checkstyle.xml
b/fineract-provider/config/checkstyle/checkstyle.xml
index bd68d88..3a66d96 100644
--- a/fineract-provider/config/checkstyle/checkstyle.xml
+++ b/fineract-provider/config/checkstyle/checkstyle.xml
@@ -126,6 +126,16 @@
<property name="format"
value="\\u00(08|09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/>
<property name="message" value="Avoid using corresponding octal or
Unicode escape."/>
</module>
+ <module name="GenericWhitespace">
+ <message key="ws.followed"
+ value="GenericWhitespace ''{0}'' is followed by whitespace."/>
+ <message key="ws.preceded"
+ value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
+ <message key="ws.illegalFollow"
+ value="GenericWhitespace ''{0}'' should followed by whitespace."/>
+ <message key="ws.notPreceded"
+ value="GenericWhitespace ''{0}'' is not preceded with
whitespace."/>
+ </module>
<module name="OneTopLevelClass"/>
<module name="MethodName">
<property name="format" value="^[a-z][a-zA-Z0-9_]*$"/>
@@ -216,16 +226,6 @@
<module name="ConstantName" />
<module name="NoFinalizer"/>
- <module name="GenericWhitespace">
- <message key="ws.followed"
- value="GenericWhitespace ''{0}'' is followed by whitespace."/>
- <message key="ws.preceded"
- value="GenericWhitespace ''{0}'' is preceded with whitespace."/>
- <message key="ws.illegalFollow"
- value="GenericWhitespace ''{0}'' should followed by whitespace."/>
- <message key="ws.notPreceded"
- value="GenericWhitespace ''{0}'' is not preceded with
whitespace."/>
- </module>
<module name="Indentation">
<property name="basicOffset" value="4"/>
<property name="braceAdjustment" value="0"/>
diff --git
a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
index b76ffd4..716ea23 100644
---
a/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
+++
b/fineract-provider/src/integrationTest/java/org/apache/fineract/integrationtests/common/HookHelper.java
@@ -88,7 +88,7 @@ public class HookHelper {
public void verifyUpdateHook(final String updateURL, final Long hookId) {
LOG.info("------------------------------CHECK UPDATE HOOK
DETAILS------------------------------------\n");
final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId +
"?" + Utils.TENANT_IDENTIFIER;
- ArrayList<HashMap<String, String>> map =
Utils.<ArrayList<HashMap<String, String>>> performServerGet(this.requestSpec,
+ ArrayList<HashMap<String, String>> map =
Utils.<ArrayList<HashMap<String, String>>>performServerGet(this.requestSpec,
this.responseSpec, GET_URL, "config");
HashMap<String, String> hash = map.get(1);
assertEquals(updateURL, hash.get("fieldValue"));
@@ -98,7 +98,7 @@ public class HookHelper {
LOG.info("------------------------------CHECK DELETE HOOK
DETAILS------------------------------------\n");
final String GET_URL = "/fineract-provider/api/v1/hooks/" + hookId +
"?" + Utils.TENANT_IDENTIFIER;
ResponseSpecification responseSpec404 = new
ResponseSpecBuilder().expectStatusCode(404).build();
- ArrayList<HashMap<String, String>> array =
Utils.<ArrayList<HashMap<String, String>>> performServerGet(this.requestSpec,
+ ArrayList<HashMap<String, String>> array =
Utils.<ArrayList<HashMap<String, String>>>performServerGet(this.requestSpec,
responseSpec404, GET_URL, "errors");
HashMap<String, String> map = array.get(0);
assertEquals("error.msg.hook.identifier.not.found",
map.get("userMessageGlobalisationCode"));
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
index 357c854..5baeac0 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadWriteNonCoreDataServiceImpl.java
@@ -90,7 +90,7 @@ public class ReadWriteNonCoreDataServiceImpl implements
ReadWriteNonCoreDataServ
private final static String CODE_VALUES_TABLE = "m_code_value";
private final static Logger LOG =
LoggerFactory.getLogger(ReadWriteNonCoreDataServiceImpl.class);
- private final static ImmutableMap<String, String> apiTypeToMySQL =
ImmutableMap.<String, String> builder().put("string", "VARCHAR")
+ private final static ImmutableMap<String, String> apiTypeToMySQL =
ImmutableMap.<String, String>builder().put("string", "VARCHAR")
.put("number", "INT").put("boolean", "BIT").put("decimal",
"DECIMAL").put("date", "DATE").put("datetime", "DATETIME")
.put("text", "TEXT").put("dropdown", "INT").build();
