Changeset eac569a for Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PetServiceImplementation.java

Timestamp:

03/04/23 19:55:18 (16 months ago)

Author:

SazdovaEkaterina <sazdovaekaterina@…>

Branches:

main

Children:

33b9f30

Parents:

3c7bf5b (diff), f194b4e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge main into adopting-a-pet

File:

• Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PetServiceImplementation.java (modified) (2 diffs)

Prototype Application/Paw5/src/main/java/finki/paw5/service/implementation/PetServiceImplementation.java

@@ -7 +7 @@
 
 import java.util.List;
-import java.util.Optional;
 
 @Service
@@ -23 +22 @@
     }
 
-    @Override
-    public List<Pet> findAll() {
-        return this.petRepository.findAll();
-    }
+    public List<Pet> listpets() {return this.petRepository.findAll();}
 
     @Override
-    public Optional<Pet> findById(Integer petId) {
-        return this.petRepository.findById(petId);
+    public Pet findById(Integer id) {
+        return this.petRepository.findById(id).get();
     }
 }