Skip to content

Commit 86c358d

Browse files
dhruvsonagaradhruvsonagara
authored
Applied formatting and styling (#105)
1 parent 085d6be commit 86c358d

File tree

81 files changed

+1844
-1289
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+1844
-1289
lines changed

‎.circleci/config.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
# - slack/notify:
2323
# event: pass
2424
# template: basic_success_1
25-
- run: ./gradlew clean bootJar
25+
- run: ./gradlew clean bootJar
2626
- aws-ecr/build-and-push-image:
2727
aws-access-key-id: AWS_ACCESS_KEY_ID
2828
aws-secret-access-key: AWS_SECRET_ACCESS_KEY
@@ -33,7 +33,7 @@ jobs:
3333
repo: phee-channel
3434
repo-scan-on-push: true
3535
role-arn: arn:aws:iam::419830066942:role/CustomAdmin
36-
tag: latest
36+
tag: latest
3737
# - run: ./gradlew cucumberCli
3838
# run tests! Slack Success/Fail Notification Step
3939
#- run: ./gradlew test
@@ -44,4 +44,3 @@ workflows:
4444
context:
4545
- AWS
4646
- slack
47-

‎.github/pull_request_template.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
Please make sure these boxes are checked before submitting your pull request - thanks!
1111

12-
- [ ] Design related bullet points or design document link related to this PR added in the description above.
12+
- [ ] Design related bullet points or design document link related to this PR added in the description above.
1313

1414
- [ ] Updated corresponding Postman Collection or Api documentation for the changes in this PR.
1515

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# payment-hub-ee
2-
Payment Hub Enterprise Edition middleware for integration to real-time payment systems.
2+
Payment Hub Enterprise Edition middleware for integration to real-time payment systems.
33
#Auto-Trigger

‎build.gradle

+135-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
/*
2-
* This file was generated by the Gradle 'init' task.
3-
*/
2+
* This file was generated by the Gradle 'init' task.
3+
*/
44

55
plugins {
66
id 'java'
77
id 'maven-publish'
88
id 'eclipse'
9+
id 'checkstyle'
910
id 'org.springframework.boot' version '2.6.2'
10-
11+
id 'com.diffplug.spotless' version '6.19.0'
1112
}
1213

1314
repositories {
@@ -21,6 +22,28 @@ repositories {
2122
}
2223
}
2324

25+
apply plugin:'com.diffplug.spotless'
26+
spotless {
27+
format 'misc', {
28+
target '**/*.md', '**/*.properties', '**/.gitignore', '**/.openapi-generator-ignore', '**/*.yml', '**/*.xml', '**/**.json', '**/*.sql'
29+
targetExclude '**/build/**','**/gsmastub/**', '**/bin/**', '**/.settings/**', '**/.idea/**', '**/.gradle/**', '**/gradlew.bat', '**/licenses/**', '**/banner.txt', '.vscode/**'
30+
indentWithSpaces(4)
31+
endWithNewline()
32+
trimTrailingWhitespace()
33+
}
34+
35+
groovyGradle {
36+
target '*.gradle', '**/*.gradle'
37+
targetExclude '**/build/**', '**/gsmastub/**'
38+
greclipse()
39+
indentWithSpaces(4)
40+
endWithNewline()
41+
trimTrailingWhitespace()
42+
}
43+
44+
lineEndings 'UNIX'
45+
}
46+
2447
dependencies {
2548
implementation 'com.google.code.gson:gson:2.8.9'
2649
implementation 'org.mifos:ph-ee-connector-common:1.4.1-SNAPSHOT'
@@ -54,8 +77,117 @@ dependencies {
5477
implementation "org.springdoc:springdoc-openapi-ui:1.6.11"
5578
implementation 'org.projectlombok:lombok:1.18.22'
5679
annotationProcessor 'org.projectlombok:lombok:1.18.24'
80+
checkstyle 'com.puppycrawl.tools:checkstyle:10.9.3'
81+
checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.44.1'
82+
implementation 'com.diffplug.gradle.spotless:spotless:2.4.1'
83+
implementation 'com.diffplug.spotless:spotless-plugin-gradle:6.17.0'
84+
}
85+
86+
configure(this) {
87+
// NOTE: order matters!
88+
apply plugin: 'java'
89+
apply plugin: 'idea'
90+
apply plugin: 'eclipse'
91+
apply plugin: 'checkstyle'
92+
configurations {
93+
implementation.setCanBeResolved(true)
94+
api.setCanBeResolved(true)
95+
}
96+
tasks.withType(JavaCompile) {
97+
options.compilerArgs += [
98+
"-Xlint:unchecked",
99+
"-Xlint:cast",
100+
"-Xlint:auxiliaryclass",
101+
"-Xlint:deprecation",
102+
"-Xlint:dep-ann",
103+
"-Xlint:divzero",
104+
"-Xlint:empty",
105+
"-Xlint:exports",
106+
"-Xlint:fallthrough",
107+
"-Xlint:finally",
108+
"-Xlint:module",
109+
"-Xlint:opens",
110+
"-Xlint:options",
111+
"-Xlint:overloads",
112+
"-Xlint:overrides",
113+
"-Xlint:path",
114+
"-Xlint:processing",
115+
"-Xlint:removal",
116+
"-Xlint:requires-automatic",
117+
"-Xlint:requires-transitive-automatic",
118+
"-Xlint:try",
119+
"-Xlint:varargs",
120+
"-Xlint:preview",
121+
"-Xlint:static",
122+
// -Werror needs to be disabled because EclipseLink's static weaving doesn't generate warning-free code
123+
// and during an IntelliJ recompilation, it fails
124+
//"-Werror",
125+
"-Xmaxwarns",
126+
1500,
127+
"-Xmaxerrs",
128+
1500
129+
]
130+
options.deprecation = true
131+
}
132+
// Configuration for the spotless plugin
133+
// https://github.com/diffplug/spotless/tree/main/plugin-gradle
134+
spotless {
135+
java {
136+
targetExclude '**/build/**', '**/bin/**', '**/out/**', '**/gsmastub/**'
137+
importOrder() //sort imports alphabetically
138+
removeUnusedImports()
139+
eclipse().configFile "$rootDir/config/channel-formatter.xml"
140+
endWithNewline()
141+
trimTrailingWhitespace()
142+
// Enforce style modifier order
143+
custom 'Modifier ordering', {
144+
def modifierRanking = [
145+
public : 1,
146+
protected : 2,
147+
private : 3,
148+
abstract : 4,
149+
default : 5,
150+
static : 6,
151+
final : 7,
152+
transient : 8,
153+
volatile : 9,
154+
synchronized: 10,
155+
native : 11,
156+
strictfp : 12]
157+
// Find any instance of multiple modifiers. Lead with a non-word character to avoid
158+
// accidental matching against for instance, "an alternative default value"
159+
it.replaceAll(/\W(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
160+
// Do not replace the leading non-word character. Identify the modifiers
161+
it.replaceAll(/(?:public |protected |private |abstract |default |static |final |transient |volatile |synchronized |native |strictfp ){2,}/, {
162+
// Sort the modifiers according to the ranking above
163+
it.split().sort({ modifierRanking[it] }).join(' ') + ' '
164+
}
165+
)
166+
}
167+
)
168+
}
169+
}
170+
lineEndings 'UNIX'
171+
}
172+
// If we are running Gradle within Eclipse to enhance classes,
173+
// set the classes directory to point to Eclipse's default build directory
174+
if (project.hasProperty('env') && project.getProperty('env') == 'eclipse') {
175+
sourceSets.main.java.outputDir = file("$projectDir/bin/main")
176+
}
177+
// Configuration for the Checkstyle plugin
178+
// https://docs.gradle.org/current/userguide/checkstyle_plugin.html
179+
dependencies {
180+
checkstyle 'com.puppycrawl.tools:checkstyle:10.3.1'
181+
checkstyle 'com.github.sevntu-checkstyle:sevntu-checks:1.42.0'
182+
}
57183
}
58184

185+
186+
checkstyle {
187+
checkstyleMain.exclude '**/gsmastub/**'
188+
}
189+
190+
59191
group = 'org.mifos'
60192
version = '1.0.0-SNAPSHOT'
61193
sourceCompatibility = JavaVersion.VERSION_17
@@ -78,4 +210,3 @@ publishing {
78210
tasks.withType(JavaCompile) {
79211
options.encoding = 'UTF-8'
80212
}
81-

‎config/channel-cleanup.xml

+71
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
3+
<profiles version="2">
4+
<profile kind="CleanUpProfile" name="channelprofile" version="2">
5+
<setting id="cleanup.use_autoboxing" value="false"/>
6+
<setting id="cleanup.qualify_static_method_accesses_with_declaring_class" value="false"/>
7+
<setting id="cleanup.always_use_this_for_non_static_method_access" value="false"/>
8+
<setting id="cleanup.organize_imports" value="true"/>
9+
<setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
10+
<setting id="cleanup.use_directly_map_method" value="false"/>
11+
<setting id="cleanup.format_source_code_changes_only" value="false"/>
12+
<setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
13+
<setting id="cleanup.add_generated_serial_version_id" value="false"/>
14+
<setting id="cleanup.remove_redundant_semicolons" value="false"/>
15+
<setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
16+
<setting id="cleanup.remove_redundant_type_arguments" value="false"/>
17+
<setting id="cleanup.remove_unused_imports" value="true"/>
18+
<setting id="cleanup.insert_inferred_type_arguments" value="false"/>
19+
<setting id="cleanup.make_private_fields_final" value="true"/>
20+
<setting id="cleanup.use_lambda" value="true"/>
21+
<setting id="cleanup.simplify_lambda_expression_and_method_ref" value="false"/>
22+
<setting id="cleanup.always_use_blocks" value="true"/>
23+
<setting id="cleanup.use_this_for_non_static_field_access_only_if_necessary" value="false"/>
24+
<setting id="cleanup.sort_members_all" value="false"/>
25+
<setting id="cleanup.remove_trailing_whitespaces_all" value="true"/>
26+
<setting id="cleanup.add_missing_annotations" value="true"/>
27+
<setting id="cleanup.remove_unnecessary_array_creation" value="false"/>
28+
<setting id="cleanup.always_use_this_for_non_static_field_access" value="true"/>
29+
<setting id="cleanup.make_parameters_final" value="true"/>
30+
<setting id="cleanup.sort_members" value="false"/>
31+
<setting id="cleanup.remove_private_constructors" value="true"/>
32+
<setting id="cleanup.always_use_parentheses_in_expressions" value="false"/>
33+
<setting id="cleanup.remove_unused_local_variables" value="false"/>
34+
<setting id="cleanup.convert_to_enhanced_for_loop" value="false"/>
35+
<setting id="cleanup.remove_unused_private_fields" value="true"/>
36+
<setting id="cleanup.remove_redundant_modifiers" value="false"/>
37+
<setting id="cleanup.never_use_blocks" value="false"/>
38+
<setting id="cleanup.number_suffix" value="false"/>
39+
<setting id="cleanup.add_missing_deprecated_annotations" value="true"/>
40+
<setting id="cleanup.use_this_for_non_static_field_access" value="true"/>
41+
<setting id="cleanup.remove_unnecessary_nls_tags" value="true"/>
42+
<setting id="cleanup.qualify_static_member_accesses_through_instances_with_declaring_class" value="true"/>
43+
<setting id="cleanup.add_missing_nls_tags" value="false"/>
44+
<setting id="cleanup.remove_unnecessary_casts" value="true"/>
45+
<setting id="cleanup.use_unboxing" value="false"/>
46+
<setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
47+
<setting id="cleanup.format_source_code" value="true"/>
48+
<setting id="cleanup.convert_functional_interfaces" value="false"/>
49+
<setting id="cleanup.add_default_serial_version_id" value="true"/>
50+
<setting id="cleanup.remove_unused_private_methods" value="true"/>
51+
<setting id="cleanup.remove_trailing_whitespaces" value="true"/>
52+
<setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>
53+
<setting id="cleanup.add_serial_version_id" value="false"/>
54+
<setting id="cleanup.use_this_for_non_static_method_access" value="true"/>
55+
<setting id="cleanup.use_this_for_non_static_method_access_only_if_necessary" value="true"/>
56+
<setting id="cleanup.use_anonymous_class_creation" value="false"/>
57+
<setting id="cleanup.add_missing_override_annotations_interface_methods" value="true"/>
58+
<setting id="cleanup.remove_unused_private_members" value="false"/>
59+
<setting id="cleanup.make_local_variable_final" value="true"/>
60+
<setting id="cleanup.add_missing_methods" value="true"/>
61+
<setting id="cleanup.never_use_parentheses_in_expressions" value="true"/>
62+
<setting id="cleanup.qualify_static_member_accesses_with_declaring_class" value="true"/>
63+
<setting id="cleanup.push_down_negation" value="false"/>
64+
<setting id="cleanup.use_parentheses_in_expressions" value="false"/>
65+
<setting id="cleanup.add_missing_override_annotations" value="true"/>
66+
<setting id="cleanup.use_blocks" value="true"/>
67+
<setting id="cleanup.make_variable_declarations_final" value="true"/>
68+
<setting id="cleanup.correct_indentation" value="true"/>
69+
<setting id="cleanup.remove_unused_private_types" value="true"/>
70+
</profile>
71+
</profiles>

0 commit comments

Comments
 (0)