style: fix spotless formatting violations in new filter files

coopernetes · claude · coopernetes · commit 9749c6e65355 · 2026-04-01T17:19:39.000-04:00
Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/jgit-proxy-core/src/main/java/org/finos/gitproxy/git/CheckEmptyBranchHook.java b/jgit-proxy-core/src/main/java/org/finos/gitproxy/git/CheckEmptyBranchHook.java
@@ -58,6 +58,7 @@ public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {
     }
 
     private List<Commit> getCommits(Repository repo, ReceiveCommand cmd) throws Exception {
-        return CommitInspectionService.getCommitRange(repo, cmd.getOldId().name(), cmd.getNewId().name());
+        return CommitInspectionService.getCommitRange(
+                repo, cmd.getOldId().name(), cmd.getNewId().name());
     }
 }
diff --git a/jgit-proxy-core/src/main/java/org/finos/gitproxy/git/CheckHiddenCommitsHook.java b/jgit-proxy-core/src/main/java/org/finos/gitproxy/git/CheckHiddenCommitsHook.java
@@ -7,7 +7,6 @@
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.stream.Collectors;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Ref;
@@ -60,7 +59,8 @@ public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {
                     + " and pushed to the remote.\n"
                     + "Please get approval on the commits, push them and try again.";
 
-            rp.sendMessage(RED + "[git-proxy] " + NO_ENTRY.emoji() + "  Push blocked — hidden commits detected" + RESET);
+            rp.sendMessage(
+                    RED + "[git-proxy] " + NO_ENTRY.emoji() + "  Push blocked — hidden commits detected" + RESET);
             rp.sendMessage(YELLOW + "[git-proxy]   " + WARNING.emoji() + "  " + msg + RESET);
 
             for (ReceiveCommand cmd : commands) {
@@ -74,12 +74,14 @@ public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {
         }
     }
 
-    private Set<String> collectIntroducedCommits(Repository repo, Collection<ReceiveCommand> commands) throws Exception {
+    private Set<String> collectIntroducedCommits(Repository repo, Collection<ReceiveCommand> commands)
+            throws Exception {
         Set<String> introduced = new HashSet<>();
         for (ReceiveCommand cmd : commands) {
             if (cmd.getResult() != ReceiveCommand.Result.NOT_ATTEMPTED) continue;
             if (cmd.getType() == ReceiveCommand.Type.DELETE) continue;
-            CommitInspectionService.getCommitRange(repo, cmd.getOldId().name(), cmd.getNewId().name())
+            CommitInspectionService.getCommitRange(
+                            repo, cmd.getOldId().name(), cmd.getNewId().name())
                     .stream()
                     .map(Commit::getSha)
                     .forEach(introduced::add);
diff --git a/jgit-proxy-core/src/main/java/org/finos/gitproxy/servlet/filter/CheckEmptyBranchFilter.java b/jgit-proxy-core/src/main/java/org/finos/gitproxy/servlet/filter/CheckEmptyBranchFilter.java
@@ -23,8 +23,8 @@
  *       state problem.
  * </ul>
  *
- * <p>This filter short-circuits immediately via {@link #rejectAndSendError} without recording to {@link
- * org.finos.gitproxy.servlet.filter.ValidationSummaryFilter}.
+ * <p>This filter short-circuits immediately via {@link #rejectAndSendError} without recording to
+ * {@link org.finos.gitproxy.servlet.filter.ValidationSummaryFilter}.
  *
  * <p>Runs at order 2050, before all other content validation filters.
  */
diff --git a/jgit-proxy-core/src/main/java/org/finos/gitproxy/servlet/filter/CheckHiddenCommitsFilter.java b/jgit-proxy-core/src/main/java/org/finos/gitproxy/servlet/filter/CheckHiddenCommitsFilter.java
@@ -17,7 +17,6 @@
 import org.eclipse.jgit.revwalk.RevCommit;
 import org.eclipse.jgit.revwalk.RevWalk;
 import org.finos.gitproxy.git.Commit;
-import org.finos.gitproxy.git.CommitInspectionService;
 import org.finos.gitproxy.git.GitClient;
 import org.finos.gitproxy.git.GitRequestDetails;
 import org.finos.gitproxy.git.HttpOperation;
@@ -38,9 +37,9 @@
  *   <li><b>hidden</b> = {@code allNew} ∖ {@code introduced}.
  * </ol>
  *
- * <p>This filter short-circuits immediately via {@link #rejectAndSendError} without recording to {@link
- * ValidationSummaryFilter}. Requires {@link EnrichPushCommitsFilter} to have run first (for both {@code pushedCommits}
- * and the unpacked local repository).
+ * <p>This filter short-circuits immediately via {@link #rejectAndSendError} without recording to
+ * {@link ValidationSummaryFilter}. Requires {@link EnrichPushCommitsFilter} to have run first (for both
+ * {@code pushedCommits} and the unpacked local repository).
  *
  * <p>Runs at order 2060, before all other content validation filters.
  */
@@ -73,9 +72,7 @@ public void doHttpFilter(HttpServletRequest request, HttpServletResponse respons
 
         Set<String> introduced = requestDetails.getPushedCommits() == null
                 ? Set.of()
-                : requestDetails.getPushedCommits().stream()
-                        .map(Commit::getSha)
-                        .collect(Collectors.toSet());
+                : requestDetails.getPushedCommits().stream().map(Commit::getSha).collect(Collectors.toSet());
 
         try {
             String remoteUrl = constructRemoteUrl(requestDetails);
@@ -100,7 +97,8 @@ public void doHttpFilter(HttpServletRequest request, HttpServletResponse respons
                     + " and pushed to the remote.\n"
                     + "Please get approval on the commits, push them and try again.";
 
-            rejectAndSendError(request, response, "Hidden commits detected", GitClient.format(title, message, RED, null));
+            rejectAndSendError(
+                    request, response, "Hidden commits detected", GitClient.format(title, message, RED, null));
 
         } catch (Exception e) {
             log.error("Failed to check hidden commits", e);
diff --git a/jgit-proxy-core/src/test/java/org/finos/gitproxy/servlet/filter/PushFinalizerFilterTest.java b/jgit-proxy-core/src/test/java/org/finos/gitproxy/servlet/filter/PushFinalizerFilterTest.java
@@ -90,7 +90,8 @@ private GitRequestDetails pendingPushDetails() {
         GitRequestDetails details = new GitRequestDetails();
         details.setOperation(HttpOperation.PUSH);
         details.setCommitTo("abc123");
-        details.setRepository(GitRequestDetails.Repository.builder().slug("owner/repo").build());
+        details.setRepository(
+                GitRequestDetails.Repository.builder().slug("owner/repo").build());
         return details;
     }
 
diff --git a/jgit-proxy-server/src/test/java/org/finos/gitproxy/e2e/GitHelper.java b/jgit-proxy-server/src/test/java/org/finos/gitproxy/e2e/GitHelper.java
@@ -55,8 +55,8 @@ void commit(Path repoDir, String message) throws IOException, InterruptedExcepti
     }
 
     /**
-     * Creates a new local branch at the current HEAD and checks it out. No new commits are made, so the branch tip
-     * is identical to the source branch — useful for testing empty-branch rejection.
+     * Creates a new local branch at the current HEAD and checks it out. No new commits are made, so the branch tip is
+     * identical to the source branch — useful for testing empty-branch rejection.
      */
     void createAndCheckoutBranch(Path repoDir, String branchName) throws IOException, InterruptedException {
         git(repoDir, "checkout", "-b", branchName);
diff --git a/jgit-proxy-server/src/test/java/org/finos/gitproxy/e2e/ProxyModeE2ETest.java b/jgit-proxy-server/src/test/java/org/finos/gitproxy/e2e/ProxyModeE2ETest.java
@@ -69,9 +69,7 @@ private PushStore pushStore() {
         return proxy.getPushStore();
     }
 
-    /**
-     * Clones, commits, and pushes. Returns the push result (exit code + output) so the caller can assert on it.
-     */
+    /** Clones, commits, and pushes. Returns the push result (exit code + output) so the caller can assert on it. */
     private GitHelper.PushResult cloneCommitPush(String dirSuffix, String authorEmail, String commitMessage)
             throws Exception {
         GitHelper git = helper();
@@ -107,12 +105,15 @@ var record = pushStore().findById(pushId);
         assertEquals(PushStatus.BLOCKED, record.get().getStatus(), "push should be BLOCKED pending review");
 
         // Approve the push
-        pushStore().approve(pushId, Attestation.builder()
-                .pushId(pushId)
-                .type(Attestation.Type.APPROVAL)
-                .reviewerUsername("e2e-test-reviewer")
-                .reason("Approved by e2e test")
-                .build());
+        pushStore()
+                .approve(
+                        pushId,
+                        Attestation.builder()
+                                .pushId(pushId)
+                                .type(Attestation.Type.APPROVAL)
+                                .reviewerUsername("e2e-test-reviewer")
+                                .reason("Approved by e2e test")
+                                .build());
 
         // Re-push — should succeed now
         var rePush = git.pushWithResult(repo);
@@ -147,12 +148,15 @@ void multipleCleanCommits_blockedThenApproved() throws Exception {
         String pushId = firstPush.extractPushId();
 
         // Approve
-        pushStore().approve(pushId, Attestation.builder()
-                .pushId(pushId)
-                .type(Attestation.Type.APPROVAL)
-                .reviewerUsername("e2e-test-reviewer")
-                .reason("Approved by e2e test")
-                .build());
+        pushStore()
+                .approve(
+                        pushId,
+                        Attestation.builder()
+                                .pushId(pushId)
+                                .type(Attestation.Type.APPROVAL)
+                                .reviewerUsername("e2e-test-reviewer")
+                                .reason("Approved by e2e test")
+                                .build());
 
         // Re-push — should succeed
         var rePush = git.pushWithResult(repo);
@@ -180,8 +184,7 @@ void noReplyHyphenLocalPart_rejected() throws Exception {
     @Test
     @Order(12)
     void nonAllowedEmailDomain_rejected() throws Exception {
-        var result = cloneCommitPush(
-                "proxy-fail-domain", "developer@internal.corp.net", "feat: non-allowed domain");
+        var result = cloneCommitPush("proxy-fail-domain", "developer@internal.corp.net", "feat: non-allowed domain");
         assertFalse(result.succeeded(), "push with disallowed email domain should be rejected");
     }
 
@@ -196,8 +199,7 @@ void githubNoreplyEmail_rejected() throws Exception {
     @Test
     @Order(20)
     void wipCommitMessage_rejected() throws Exception {
-        var result =
-                cloneCommitPush("proxy-fail-wip", GiteaContainer.VALID_AUTHOR_EMAIL, "WIP: still working on this");
+        var result = cloneCommitPush("proxy-fail-wip", GiteaContainer.VALID_AUTHOR_EMAIL, "WIP: still working on this");
         assertFalse(result.succeeded(), "push with WIP message should be rejected");
     }
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ public void onPreReceive(ReceivePack rp, Collection<ReceiveCommand> commands) {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private List<Commit> getCommits(Repository repo, ReceiveCommand cmd) throws Exception {`
`61`		`- return CommitInspectionService.getCommitRange(repo, cmd.getOldId().name(), cmd.getNewId().name());`
	`61`	`+ return CommitInspectionService.getCommitRange(`
	`62`	`+ repo, cmd.getOldId().name(), cmd.getNewId().name());`
`62`	`63`	`}`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,8 @@`
`23`	`23`	`* state problem.`
`24`	`24`	`* </ul>`
`25`	`25`	`*`
`26`		`- * <p>This filter short-circuits immediately via {@link #rejectAndSendError} without recording to {@link`
`27`		`- * org.finos.gitproxy.servlet.filter.ValidationSummaryFilter}.`
	`26`	`+ * <p>This filter short-circuits immediately via {@link #rejectAndSendError} without recording to`
	`27`	`+ * {@link org.finos.gitproxy.servlet.filter.ValidationSummaryFilter}.`
`28`	`28`	`*`
`29`	`29`	`* <p>Runs at order 2050, before all other content validation filters.`
`30`	`30`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,8 @@ private GitRequestDetails pendingPushDetails() {`
`90`	`90`	`GitRequestDetails details = new GitRequestDetails();`
`91`	`91`	`details.setOperation(HttpOperation.PUSH);`
`92`	`92`	`details.setCommitTo("abc123");`
`93`		`- details.setRepository(GitRequestDetails.Repository.builder().slug("owner/repo").build());`
	`93`	`+ details.setRepository(`
	`94`	`+ GitRequestDetails.Repository.builder().slug("owner/repo").build());`
`94`	`95`	`return details;`
`95`	`96`	`}`
`96`	`97`