Skip to content
Snippets Groups Projects

WIP: Resolve "Use Librador for generics"

5 files
+ 31
81
Compare changes
  • Side-by-side
  • Inline

Files

@@ -37,6 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.validation.Errors;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -156,8 +157,8 @@ public class AdminController {
*/
@Transactional
@PostMapping("/rooms")
public String createRoom(@Valid RoomCreateDTO dto, RedirectAttributes redirectAttributes) {
roomRepository.save(mapper.map(dto, Room.class));
public String createRoom(@Valid RoomCreateDTO dto, RedirectAttributes redirectAttributes, Errors errors) {
roomRepository.save(dto.apply(errors));
redirectAttributes.addFlashAttribute("message", "Room has been created.");
return "redirect:/admin/rooms";
@@ -198,10 +199,10 @@ public class AdminController {
@PostMapping("/room/edit/{id}")
public String saveRoom(@PathVariable("id") Long id,
@RequestParam("map") MultipartFile map,
RoomPatchDTO dto, RedirectAttributes redirectAttributes)
@Valid RoomPatchDTO dto, RedirectAttributes redirectAttributes, Errors errors)
throws IOException {
Room room = roomRepository.findByIdOrThrow(id);
dto.apply(room);
dto.apply(room, errors);
if (map != null && !map.getOriginalFilename().isEmpty()) {
adminService.uploadFile(map);
Loading