Merge pull request #10 from AdamZink/develop

Part 3 to Master

Author: AdamZink

src/main/java/com/github/adamzink/springbootmysqldemo/converter/common/ModelConverter.java

@@ -1,9 +1,21 @@
 package com.github.adamzink.springbootmysqldemo.converter.common;
 
+import java.util.ArrayList;
+import java.util.Collection;
+
 public interface ModelConverter<Q, M, S> {
 
     M requestToModel(Q request);
 
     S modelToResponse (M model);
 
+    default Collection<S> modelToResponse(final Iterable<M> models) {
+        assert models != null;
+
+        final Collection<S> responses = new ArrayList<S>();
+        models.forEach(model -> responses.add(modelToResponse(model)));
+
+        return responses;
+    }
+
 }

src/main/java/com/github/adamzink/springbootmysqldemo/resource/UserResource.java

@@ -8,6 +8,7 @@
 
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
+import java.util.Collection;
 
 @Path("/users")
 @Component
@@ -16,12 +17,32 @@ public class UserResource {
     @Autowired
     UserService userService;
 
+    @GET
+    @Produces(MediaType.APPLICATION_JSON)
+    public Collection<User> getAll() {
+        return userService.getAll();
+    }
+
     @POST
     @Consumes(MediaType.APPLICATION_JSON)
     @Produces(MediaType.APPLICATION_JSON)
     public User save(final UserRequest userRequest) {
         return userService.save(userRequest);
     }
 
+    @PUT
+    @Path("{id}")
+    @Consumes(MediaType.APPLICATION_JSON)
+    @Produces(MediaType.APPLICATION_JSON)
+    public User update(@PathParam("id") final Long id, final UserRequest userRequest) {
+        return userService.update(id, userRequest);
+    }
+
+    @DELETE
+    @Path("{id}")
+    public void delete(@PathParam("id") final Long id) {
+        userService.delete(id);
+    }
+
 }
 

src/main/java/com/github/adamzink/springbootmysqldemo/service/UserService.java

@@ -9,6 +9,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collection;
 import java.util.Date;
 
 @Service
@@ -21,6 +22,10 @@ public class UserService {
     @Autowired
     UserRepository userRepository;
 
+    public Collection<User> getAll() {
+        return userConverter.modelToResponse(userRepository.findAll());
+    }
+
     public User save(final UserRequest userRequest) {
         UserModel userModel = userConverter.requestToModel(userRequest);
 
@@ -29,5 +34,19 @@ public User save(final UserRequest userRequest) {
         return userConverter.modelToResponse(userRepository.save(userModel));
     }
 
+    public User update(final Long id, final UserRequest userRequest) {
+        UserModel fromRequest = userConverter.requestToModel(userRequest);
+
+        UserModel toSave = userRepository.getOne(id);
+        toSave.setFirstName(fromRequest.getFirstName());
+        toSave.setLastName(fromRequest.getLastName());
+
+        return userConverter.modelToResponse(userRepository.save(toSave));
+    }
+
+    public void delete(final Long id) {
+        userRepository.deleteById(id);
+    }
+
 }