GroupManagementController aufgeraeumt

groupManagement/src/main/java/thinkTogether/groupManagement/GroupManagementApplication.java

@@ -2,7 +2,6 @@ package thinkTogether.groupManagement;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import thinkTogether.groupManagement.controller.GroupManagementController;
 
 @SpringBootApplication
 public class GroupManagementApplication {

groupManagement/src/main/java/thinkTogether/groupManagement/controller/GroupManagementController.java

 package thinkTogether.groupManagement.controller;
 
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RestController;
 import thinkTogether.groupManagement.model.Group;
+import thinkTogether.groupManagement.repo.IGroupRepository;
 
 import java.util.List;
 
 
 @RestController
 // Verwendet das Repository und gibt die Daten zurück
-public class GroupManagementController implements iGroupService {
+public class GroupManagementController {
 
+    private final IGroupRepository groupRepository;
 
-    private thinkTogether.groupManagement.repo.iGroupRepository groupRepository;
-
-    @RequestMapping("/")
-    public String index() {
-       return "Hello from the GroupManagement Controller!";
+    public GroupManagementController(IGroupRepository groupRepository) {
+        this.groupRepository = groupRepository;
     }
 
-    //@Autowired
-    //public GroupManagementController(Repository repository){
-    //    this.repository = (thinkTogether.groupManagement.repo.iGroupRepository) repository;
-    //}
-
-
-    //@RequestMapping(value="/groups")
-    @Override
-    public List<Group> findAll() {
-        List<Group> actual = groupRepository.findAll();
 
-    //    List<Group> gruppen = new ArrayList<Group>();
-    //    actual.forEach(element -> gruppen.add(element));
-
-        return actual;
+    @GetMapping("/")
+    public String index() {
+        return "Hello from the GroupManagement Controller!";
     }
 
-    //@RequestMapping(value = "/groups/{id}", method = RequestMethod.GET)
-    @Override
-    public Group findByID(@PathVariable("ID") int id) {
-        return groupRepository.findByID(id);
+    @GetMapping(value = "/groups")
+    public List<Group> findAll() {
+        return groupRepository.findAll();
     }
 
 
-    //@GetMapping("/groups/{id}")
-    //public Group getGroupById(@PathVariable(value = "group_ID") long group_ID) {
-    //    Group group = repository.findOne(group_ID);
-    //    return group;
-    //}
 
+    /**
+     * e.g. http://localhost:8080/groups/2/
+     *
+     * @param id
+     * @return
+     */
+    @GetMapping(value = "/groups/{id}/")
+    public Group findByID(
+            @PathVariable(value = "id") long id
+    ) {
+        final Group group = groupRepository.findByID(id);
 
+        return group;
+    }
 }

groupManagement/src/main/java/thinkTogether/groupManagement/repo/iGroupRepository.java → groupManagement/src/main/java/thinkTogether/groupManagement/repo/IGroupRepository.java

 package thinkTogether.groupManagement.repo;
 
 
-import org.springframework.data.repository.Repository;
-import org.springframework.stereotype.Service;
+import org.springframework.data.repository.CrudRepository;
 import thinkTogether.groupManagement.model.Group;
 
-import javax.persistence.Id;
 import java.util.List;
 
 //Erstellt Zwischenspeicher für die Datenentitäten? "DAO"???
-@Service
-public interface iGroupRepository extends Repository<Group, Integer> {
+public interface IGroupRepository extends CrudRepository<Group, Long> {
     public List<Group> findAll();
-    public Group findByID(int ID);
 
+    public Group findByID(Long ID);
 
 }