Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependency checkstyle to v10.20.1 #5675

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update dependency checkstyle to v10.20.1 #5675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3167b72
Update dependency checkstyle to v10.20.1
renovate[bot] Nov 25, 2024
76c64de
Update checkstyle violations after update
DanCatchpole Nov 25, 2024
89333d1
Merge branch 'master' into renovate/checkstyle-10.x
DanCatchpole Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion service/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ task highLevelDataSetup(type: JavaExec, description: 'High level data step mock

checkstyle {
maxWarnings = 0
toolVersion = "10.14.0"
toolVersion = "10.20.1"
// need to set configDirectory to rootDir otherwise submodule will use submodule/config/checkstyle
getConfigDirectory().set(new File(rootDir, 'config/checkstyle'))
}
Expand Down
1 change: 1 addition & 0 deletions service/src/main/java/uk/gov/hmcts/reform/fpl/service/CourtService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ public String getCourtEmail(CaseData caseData) {
/**
* This method is intended to not send a notification to CTSC but will continue to send to court email when
* required.
*
* <p>
* Returns null if the CaseData sendToCtsc field is set to Yes.<br/>
* Otherwise will return the RCJ High Court email or the selected court email.
Expand Down
4 changes: 2 additions & 2 deletions ...s/reform/fpl/service/orders/prepopulator/question/ParentalResponsibilityPrePopulator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ public OrderQuestionBlock accept() {
@Override
public Map<String, Object> prePopulate(CaseData caseData) {

Map<String, Object> data = new HashMap<>();

if (hasDataAlreadySet(caseData)) {
return Map.of();
}
Expand All @@ -56,6 +54,8 @@ public Map<String, Object> prePopulate(CaseData caseData) {
return Map.of();
}

Map<String, Object> data = new HashMap<>();

if (selectedApplicationBundle instanceof C2DocumentBundle
&& ((C2DocumentBundle) selectedApplicationBundle).getC2AdditionalOrdersRequested().contains(
PARENTAL_RESPONSIBILITY)) {
Expand Down
Loading