code-review: removed unnecessary items

Geez14 · Jan 20, 2025 · a536ac0 · a536ac0
1 parent dea49cc
commit a536ac0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/src/main/java/com/geez14/app/controllers/CashCardController.java b/src/main/java/com/geez14/app/controllers/CashCardController.java
@@ -8,7 +8,6 @@
 import org.springframework.data.domain.Sort;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.method.support.CompositeUriComponentsContributor;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
@@ -20,11 +19,9 @@
 @RequestMapping(path = "/cashcards")
 public class CashCardController {
     private final CashCardRepository cashCardRepository;
-    private final CompositeUriComponentsContributor compositeUriComponentsContributor;
 
-    private CashCardController(CashCardRepository cashCardRepository, CompositeUriComponentsContributor compositeUriComponentsContributor) {
+    private CashCardController(CashCardRepository cashCardRepository) {
         this.cashCardRepository = cashCardRepository;
-        this.compositeUriComponentsContributor = compositeUriComponentsContributor;
     }
 
     /**
@@ -44,10 +41,7 @@ private ResponseEntity<CashCard> getCashCard(@PathVariable Long requestedId, Pri
         // the below code is written by AI not me
         // return cashCard.map(ResponseEntity::ok).orElseGet(ResponseEntity.notFound()::build);
         // this is my code!
-        if (cashCard.isPresent()) {
-            return ResponseEntity.ok(cashCard.get());
-        }
-        return ResponseEntity.notFound().build();
+        return cashCard.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound().build());
     }
 
 
@@ -96,9 +90,6 @@ private ResponseEntity<Iterable<CashCard>> getCashCards(Pageable pageable, Princ
 
     @PutMapping("/{requestedId}")
     private ResponseEntity<Void> putCashCard(@PathVariable Long requestedId, @RequestBody CashCard newCashCard, Principal principal) {
-        // This doesn't solve the issue, if the card doesn't exist to return 404 error!
-        // CashCard cashCardWithOwner = new CashCard(requestedId, newCashCard.amount(), principal.getName());
-        // cashCardRepository.save(cashCardWithOwner);
         if (cashCardRepository.existsByIdAndOwner(requestedId, principal.getName())) {
             cashCardRepository.save(new CashCard(requestedId, newCashCard.amount(), principal.getName()));
             return ResponseEntity.noContent().build();

diff --git a/src/test/java/com/geez14/app/CashCardApplicationTests.java b/src/test/java/com/geez14/app/CashCardApplicationTests.java
@@ -1,10 +1,8 @@
 package com.geez14.app;
 
 import com.geez14.app.entities.CashCard;
-import com.geez14.app.util.Debug;
 import com.jayway.jsonpath.DocumentContext;
 import com.jayway.jsonpath.JsonPath;
-import org.assertj.core.api.Assert;
 import org.assertj.core.api.Assertions;
 import net.minidev.json.JSONArray;
 import org.junit.jupiter.api.Test;
@@ -16,7 +14,6 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.web.util.UriComponentsBuilder;
 
 import java.net.URI;
 import java.util.List;
@@ -38,8 +35,6 @@ void shouldReturnACashCardWhenRequested() {
         ResponseEntity<String> responseEntity = restTemplate.withBasicAuth("Mxtylish", "password1234").getForEntity("/cashcards/99", String.class);
         Assertions.assertThat(responseEntity.getStatusCode()).isEqualTo(HttpStatus.OK);
 
-        // ObjectMapper mapper = new ObjectMapper();
-        // String jsonResponse = mapper.writeValueAsString(responseEntity.getBody());
         DocumentContext documentContext = JsonPath.parse(responseEntity.getBody());
         int id = documentContext.read("$.id");
         double amount = documentContext.read("$.amount");
@@ -189,7 +184,6 @@ void shouldUpdateACashCard() {
         Assertions.assertThat(getResponse.getStatusCode()).isEqualTo(HttpStatus.OK);
 
         DocumentContext documentContext = JsonPath.parse(getResponse.getBody());
-        int id = documentContext.read("$.id");
         double amount = documentContext.read("$.amount");
         Assertions.assertThat(amount).isEqualTo(updatedCashCard.amount());
     }