Merge branch 'get' into 'master'

Fixes mapping for get methods

See merge request kmuldoon/student-marks-microservice!6

src/main/java/com/StudentServices/MarksService/controller/StudentMarksController.java

@@ -18,7 +18,7 @@ public class StudentMarksController {
     @Autowired StudentService studentService;
 
     // (GET) findall studentmarks
-    @GetMapping
+    @GetMapping("/studentMarks")
     ResponseEntity<List<StudentMarks>> findAllStudentMarks(){
         return ResponseEntity.ok(studentService.findAllStudents());
     }
@@ -30,8 +30,8 @@ public class StudentMarksController {
     }
 
     // (GET) find studentmark by id
-    @GetMapping
-    ResponseEntity<StudentMarks> findStudentMarksById(String id){
+    @GetMapping("/studentMarks/{id}")
+    ResponseEntity<StudentMarks> findStudentMarksById(@PathVariable String id){
         StudentMarks sm = studentService.getStudentById(id);
         if (sm == null){
             return new ResponseEntity<>(HttpStatus.NOT_FOUND);

src/main/java/com/StudentServices/MarksService/service/StudentService.java

@@ -20,7 +20,7 @@ public class StudentService {
 
 
     public List<StudentMarks> findAllStudents() {
-        return null;
+        return studentRepository.findAll();
     }
 
     public StudentMarks addStudent(StudentMarks studentMarks) {