From 461bec059841fa5f7740a51b19509b023fa44b1c Mon Sep 17 00:00:00 2001 From: MiriyalaJayanth-19 Date: Thu, 26 Mar 2026 12:23:00 +0530 Subject: [PATCH] minor : Cleared Right Curly Errors --- .../generatepatchfile/GeneratePatchFile.java | 15 +++++---------- .../GeneratePatchFileLauncher.java | 3 +-- .../checkstyle/generatepatchfile/Utils.java | 3 +-- .../filters/JavaPatchFilterElement.java | 12 ++++-------- .../checkstyle/filters/LoadPatchFileUtils.java | 6 ++---- .../filters/SuppressionJavaPatchFilter.java | 6 ++---- .../filters/SuppressionPatchFilter.java | 6 ++---- .../filters/SuppressionPatchFilterElement.java | 3 +-- 8 files changed, 18 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFile.java b/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFile.java index 2fb87987..581e709e 100644 --- a/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFile.java +++ b/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFile.java @@ -141,8 +141,7 @@ public GeneratePatchFile(String repoPath, String testerPath, this.repository = new FileRepositoryBuilder().setGitDir(gitDir) .readEnvironment().findGitDir().build(); git = new Git(repository); - } - catch (IOException ex) { + } catch (IOException ex) { ex.printStackTrace(); } diffReportDirName = new File(".").getAbsoluteFile().getParent() + "/DiffReport"; @@ -261,14 +260,11 @@ private void generateTwoCommitDiffPatch(RevCommit commitOld, RevCommit commitNew private void generateDiffPatchWithGitCommand(int headNum, String patchFormat) throws Exception { if ("show".equals(patchFormat)) { runShellCommand("git show > show.patch"); - } - else if ("diff".equals(patchFormat)) { + } else if ("diff".equals(patchFormat)) { runShellCommand("git diff HEAD~1 HEAD > show.patch"); - } - else if ("format".equals(patchFormat)) { + } else if ("format".equals(patchFormat)) { runShellCommand("git format-patch -1"); - } - else { + } else { throw new IllegalArgumentException("patchFormat should be 'show', 'diff' or 'format'"); } final File repoDir = new File(repoPath); @@ -405,8 +401,7 @@ private void generateSummaryIndexHtml() { } out.write("\n"); - } - catch (IOException ex) { + } catch (IOException ex) { ex.printStackTrace(); } } diff --git a/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFileLauncher.java b/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFileLauncher.java index 1870218a..0fe01c66 100644 --- a/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFileLauncher.java +++ b/src/main/java/com/github/checkstyle/generatepatchfile/GeneratePatchFileLauncher.java @@ -52,8 +52,7 @@ public static void main(String[] args) throws Exception { final String commitParam = args[6]; if (commitParam.matches("(0|[1-9]\\d*)")) { generatePatchFile.generatePatch(Integer.parseInt(args[6])); - } - else { + } else { final String[] commitIds = commitParam.split(","); final Set commitSet = new HashSet<>(Arrays.asList(commitIds)); generatePatchFile.generatePatch(commitSet); diff --git a/src/main/java/com/github/checkstyle/generatepatchfile/Utils.java b/src/main/java/com/github/checkstyle/generatepatchfile/Utils.java index d71221aa..e02c3eac 100644 --- a/src/main/java/com/github/checkstyle/generatepatchfile/Utils.java +++ b/src/main/java/com/github/checkstyle/generatepatchfile/Utils.java @@ -53,8 +53,7 @@ public static void copyDir(File src, File dest) throws IOException { final File destFile = new File(dest, file); copyDir(srcFile, destFile); } - } - else { + } else { final InputStream inputStream = new FileInputStream(src); final OutputStream outputStream = new FileOutputStream(dest); final int size = 1024; diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java index b3ce06ca..0ae3c8f4 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/JavaPatchFilterElement.java @@ -168,8 +168,7 @@ public boolean accept(TreeWalkerAuditEvent event) { && (isNeverSuppressCheck(event) || isMatchingByContextStrategy(event) || isLineMatching(event)); - } - else { + } else { result = isFileNameMatching(event) && (isNeverSuppressCheck(event) || isLineMatching(event)); @@ -238,8 +237,7 @@ private boolean lineMatching(int currentLine) { final int endLine = singleLineRangeList.get(1) + 1; if (startLine == endLine) { result = currentLine == startLine; - } - else { + } else { result = currentLine >= startLine && currentLine < endLine; } if (result) { @@ -311,8 +309,7 @@ private DetailAST getAncestorAst(TreeWalkerAuditEvent event) { eventAst = eventAst.getParent(); } } - } - else if (containsShortName(checkNamesForContextStrategyByTokenOrParentSet, event)) { + } else if (containsShortName(checkNamesForContextStrategyByTokenOrParentSet, event)) { if (eventAst != null) { eventAst = eventAst.getParent(); } @@ -408,8 +405,7 @@ private static void setChildAstLineNo(Map childAstLineNoMap, De final int lineNo = ast.getLineNo(); if (lineNo < childAstLineNoMap.get(MIN)) { childAstLineNoMap.put(MIN, lineNo); - } - else if (lineNo > childAstLineNoMap.get(MAX)) { + } else if (lineNo > childAstLineNoMap.get(MAX)) { childAstLineNoMap.put(MAX, lineNo); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/LoadPatchFileUtils.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/LoadPatchFileUtils.java index 4eeab51d..fd4f7956 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/LoadPatchFileUtils.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/LoadPatchFileUtils.java @@ -87,15 +87,13 @@ private void addSingleLineRange(List> lineRangeList, Edit edit) { if (lineRange != null) { lineRangeList.add(lineRange); } - } - else if (Strategy.PATCHEDLINE == strategy) { + } else if (Strategy.PATCHEDLINE == strategy) { final List lineRange = getLineRange(edit, Arrays.asList(Edit.Type.INSERT, Edit.Type.REPLACE)); if (lineRange != null) { lineRangeList.add(lineRange); } - } - else { + } else { final List lineRange = getLineRange(edit, Arrays.asList(Edit.Type.INSERT, Edit.Type.REPLACE, Edit.Type.DELETE)); diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilter.java index 3aedaac8..4b15f6fc 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionJavaPatchFilter.java @@ -209,12 +209,10 @@ public void finishLocalSetup() throws CheckstyleException { if (optional) { if (FilterUtil.isFileExists(file)) { loadPatchFile(); - } - else { + } else { filters = new HashSet<>(); } - } - else { + } else { loadPatchFile(); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilter.java index 10d22662..33238895 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilter.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilter.java @@ -140,12 +140,10 @@ public void finishLocalSetup() throws CheckstyleException { if (optional) { if (FilterUtil.isFileExists(file)) { loadPatchFile(); - } - else { + } else { filters = new PatchFilterSet(); } - } - else { + } else { loadPatchFile(); } } diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterElement.java index 68deacf0..f4d132dd 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterElement.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionPatchFilterElement.java @@ -109,8 +109,7 @@ private static boolean isTreeWalkerChecksMatching(AuditEvent event) { result = true; } return result; - } - catch (ClassNotFoundException ex) { + } catch (ClassNotFoundException ex) { throw new IllegalStateException("Class " + sourceName + " not found", ex); } }