From 6001deba20ead6ca91fcfb281bc0ff8da06b64af Mon Sep 17 00:00:00 2001 From: Lucas Barbosa Dourado Date: Fri, 12 Dec 2025 22:59:33 -0300 Subject: [PATCH 1/7] =?UTF-8?q?fix:=20reformular=20e=20reaplicar=20l=C3=B3?= =?UTF-8?q?gica=20de=20formata=C3=A7=C3=A3o=20de=20c=C3=B3digo=20com=20o?= =?UTF-8?q?=20spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pipeline.yml | 34 +-------------- .github/workflows/spotless.yml | 43 +++++++++++++++++++ .../controller/ReminderController.java | 11 +++-- 3 files changed, 51 insertions(+), 37 deletions(-) create mode 100644 .github/workflows/spotless.yml diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 4544d83..698d948 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -48,36 +48,4 @@ jobs: uses: actions/upload-artifact@v5.0.0 with: name: jacoco-report - path: target/site/jacoco - - format: - name: Format Code - permissions: - contents: write - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v5.0.0 - with: - ref: ${{ github.event.pull_request.head.ref}} - fetch-depth: 0 - - - name: Instalar Java 25 - uses: actions/setup-java@v5.0.0 - with: - distribution: "temurin" - java-version: 25 - - name: Formatar código com Spotless - run: ./mvnw spotless:apply - - - name: Faz um commit e push das mudanças - run: | - git config user.name "github-actions[bot]" - git config user.email "github-actions[bot]@users.noreply.github.com" - git add . - if ! git diff --staged --quiet; then - git commit -m "Aplica formatação do spotless" - git push - else - echo "Nenhuma mudança de formatação necessária." - fi + path: target/site/jacoco \ No newline at end of file diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml new file mode 100644 index 0000000..d221517 --- /dev/null +++ b/.github/workflows/spotless.yml @@ -0,0 +1,43 @@ +name: Format Code + +on: + pull_request_review: + types: [submitted] + +permissions: + contents: write + pull-requests: write + +jobs: + format: + if: github.event.review.state == 'approved' + runs-on: ubuntu-latest + + steps: + - name: Checkout na branch do Pull Request + uses: actions/checkout@v5 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + fetch-depth: 0 + + - name: Instalar Java 25 + uses: actions/setup-java@v5 + with: + distribution: temurin + java-version: 25 + + - name: Aplicar Spotless + run: ./mvnw spotless:apply + + - name: Commit e push se houver mudanças + run: | + if [[ -n "$(git status --porcelain)" ]]; then + git config user.name "github-actions[bot]" + git config user.email "github-actions[bot]@users.noreply.github.com" + git add . + git commit -m "chore: apply spotless formatting" + git push + else + echo "Nenhuma mudança de formatação." + fi \ No newline at end of file diff --git a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java index 3529253..e754041 100644 --- a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java +++ b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java @@ -23,7 +23,8 @@ public ReminderController(ReminderService reminderService) { @GetMapping public ResponseEntity> findAll( - @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) { + @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) + { Pageable pageable = PageRequest.of(page, size); Page reminderPage = reminderService.findAll(pageable); @@ -31,12 +32,14 @@ public ResponseEntity> findAll( } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable Long id) { + public ResponseEntity findById(@PathVariable Long id) + { return ResponseEntity.ok(reminderService.findById(id)); } - @PostMapping() - public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) { + @PostMapping + public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) + { return ResponseEntity.status(HttpStatus.CREATED).body(reminderService.create(dto)); } From 0b3ccf6c515a4a085f6f858b2ed8162171bcbde5 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 13 Dec 2025 02:07:36 +0000 Subject: [PATCH 2/7] chore: apply spotless formatting --- .../reminder/controller/ReminderController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java index e754041..596d63e 100644 --- a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java +++ b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java @@ -23,8 +23,7 @@ public ReminderController(ReminderService reminderService) { @GetMapping public ResponseEntity> findAll( - @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) - { + @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) { Pageable pageable = PageRequest.of(page, size); Page reminderPage = reminderService.findAll(pageable); @@ -32,14 +31,12 @@ public ResponseEntity> findAll( } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable Long id) - { + public ResponseEntity findById(@PathVariable Long id) { return ResponseEntity.ok(reminderService.findById(id)); } @PostMapping - public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) - { + public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) { return ResponseEntity.status(HttpStatus.CREATED).body(reminderService.create(dto)); } From 5aaf72994077db7fec44ee78ce3acd71df8e31b5 Mon Sep 17 00:00:00 2001 From: Lucas Barbosa Dourado Date: Fri, 12 Dec 2025 23:11:02 -0300 Subject: [PATCH 3/7] =?UTF-8?q?fix:=20reformular=20e=20reaplicar=20l=C3=B3?= =?UTF-8?q?gica=20de=20formata=C3=A7=C3=A3o=20de=20c=C3=B3digo=20com=20o?= =?UTF-8?q?=20spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reminder/controller/ReminderController.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java index 596d63e..bec5469 100644 --- a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java +++ b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java @@ -31,18 +31,21 @@ public ResponseEntity> findAll( } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable Long id) { + public ResponseEntity findById(@PathVariable Long id) + { return ResponseEntity.ok(reminderService.findById(id)); } @PostMapping - public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) { + public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) + { return ResponseEntity.status(HttpStatus.CREATED).body(reminderService.create(dto)); } @PutMapping("/{id}") public ResponseEntity update( - @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) { + @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) + { return ResponseEntity.ok(reminderService.update(id, dto)); } From 1bc959892aebf884f090981f03a9fb2e0059b546 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 13 Dec 2025 02:15:12 +0000 Subject: [PATCH 4/7] chore: apply spotless formatting --- .../reminder/controller/ReminderController.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java index bec5469..596d63e 100644 --- a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java +++ b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java @@ -31,21 +31,18 @@ public ResponseEntity> findAll( } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable Long id) - { + public ResponseEntity findById(@PathVariable Long id) { return ResponseEntity.ok(reminderService.findById(id)); } @PostMapping - public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) - { + public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) { return ResponseEntity.status(HttpStatus.CREATED).body(reminderService.create(dto)); } @PutMapping("/{id}") public ResponseEntity update( - @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) - { + @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) { return ResponseEntity.ok(reminderService.update(id, dto)); } From eaebed75d2880e1f0cf300ee473e50218820dbf6 Mon Sep 17 00:00:00 2001 From: Lucas Barbosa Dourado Date: Fri, 12 Dec 2025 23:49:41 -0300 Subject: [PATCH 5/7] =?UTF-8?q?fix:=20reformular=20e=20reaplicar=20l=C3=B3?= =?UTF-8?q?gica=20de=20formata=C3=A7=C3=A3o=20de=20c=C3=B3digo=20com=20o?= =?UTF-8?q?=20spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pipeline.yml | 18 ++++++++++++++++-- .../controller/ReminderController.java | 12 ++++++++---- 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 698d948..fefef3f 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -10,6 +10,9 @@ permissions: jobs: build: + if: | + github.actor != 'github-actions[bot]' && + !contains(github.event.pull_request.title, 'spotless') name: Build runs-on: ubuntu-latest @@ -28,6 +31,9 @@ jobs: run: mvn -B clean package -DskipTests tests: + if: | + github.actor != 'github-actions[bot]' && + !contains(github.event.pull_request.title, 'spotless') name: Tests runs-on: ubuntu-latest needs: build @@ -44,8 +50,16 @@ jobs: - name: Testes Unitários run: mvn -B verify - - name: Upload do relátório do JaCoCo + - name: Upload do relatório do JaCoCo uses: actions/upload-artifact@v5.0.0 with: name: jacoco-report - path: target/site/jacoco \ No newline at end of file + path: target/site/jacoco + + bot-pass: + if: github.actor == 'github-actions[bot]' + name: CI ignorada (bot commit) + runs-on: ubuntu-latest + + steps: + - run: echo "Commit automático do Spotless — CI ignorada" \ No newline at end of file diff --git a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java index 596d63e..37bcfef 100644 --- a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java +++ b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java @@ -23,7 +23,8 @@ public ReminderController(ReminderService reminderService) { @GetMapping public ResponseEntity> findAll( - @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) { + @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) + { Pageable pageable = PageRequest.of(page, size); Page reminderPage = reminderService.findAll(pageable); @@ -31,18 +32,21 @@ public ResponseEntity> findAll( } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable Long id) { + public ResponseEntity findById(@PathVariable Long id) + { return ResponseEntity.ok(reminderService.findById(id)); } @PostMapping - public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) { + public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) + { return ResponseEntity.status(HttpStatus.CREATED).body(reminderService.create(dto)); } @PutMapping("/{id}") public ResponseEntity update( - @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) { + @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) + { return ResponseEntity.ok(reminderService.update(id, dto)); } From d383407cbe6f614927e4b84c5ca34e3d50000710 Mon Sep 17 00:00:00 2001 From: Lucas Barbosa Dourado Date: Fri, 12 Dec 2025 23:52:18 -0300 Subject: [PATCH 6/7] =?UTF-8?q?fix:=20reformular=20e=20reaplicar=20l=C3=B3?= =?UTF-8?q?gica=20de=20formata=C3=A7=C3=A3o=20de=20c=C3=B3digo=20com=20o?= =?UTF-8?q?=20spotless?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/pipeline.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index fefef3f..698d948 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -10,9 +10,6 @@ permissions: jobs: build: - if: | - github.actor != 'github-actions[bot]' && - !contains(github.event.pull_request.title, 'spotless') name: Build runs-on: ubuntu-latest @@ -31,9 +28,6 @@ jobs: run: mvn -B clean package -DskipTests tests: - if: | - github.actor != 'github-actions[bot]' && - !contains(github.event.pull_request.title, 'spotless') name: Tests runs-on: ubuntu-latest needs: build @@ -50,16 +44,8 @@ jobs: - name: Testes Unitários run: mvn -B verify - - name: Upload do relatório do JaCoCo + - name: Upload do relátório do JaCoCo uses: actions/upload-artifact@v5.0.0 with: name: jacoco-report - path: target/site/jacoco - - bot-pass: - if: github.actor == 'github-actions[bot]' - name: CI ignorada (bot commit) - runs-on: ubuntu-latest - - steps: - - run: echo "Commit automático do Spotless — CI ignorada" \ No newline at end of file + path: target/site/jacoco \ No newline at end of file From 82b874bf3aed1fee64d49aa797812b4f75747685 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Sat, 13 Dec 2025 02:55:18 +0000 Subject: [PATCH 7/7] chore: apply spotless formatting --- .../reminder/controller/ReminderController.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java index 37bcfef..596d63e 100644 --- a/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java +++ b/src/main/java/br/com/springnoobs/reminderapi/reminder/controller/ReminderController.java @@ -23,8 +23,7 @@ public ReminderController(ReminderService reminderService) { @GetMapping public ResponseEntity> findAll( - @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) - { + @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size) { Pageable pageable = PageRequest.of(page, size); Page reminderPage = reminderService.findAll(pageable); @@ -32,21 +31,18 @@ public ResponseEntity> findAll( } @GetMapping("/{id}") - public ResponseEntity findById(@PathVariable Long id) - { + public ResponseEntity findById(@PathVariable Long id) { return ResponseEntity.ok(reminderService.findById(id)); } @PostMapping - public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) - { + public ResponseEntity create(@RequestBody @Valid CreateReminderRequestDTO dto) { return ResponseEntity.status(HttpStatus.CREATED).body(reminderService.create(dto)); } @PutMapping("/{id}") public ResponseEntity update( - @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) - { + @PathVariable Long id, @RequestBody @Valid UpdateReminderRequestDTO dto) { return ResponseEntity.ok(reminderService.update(id, dto)); }