Projekt

Obecné

Profil

« Předchozí | Další » 

Revize 7e85f82d

Přidáno uživatelem Pavel Fidransky před více než 4 roky(ů)

re #41 use HTTP method-based annotations instead of generic RequestMapping

Zobrazit rozdíly:

server/src/main/java/org/danekja/ymanager/ws/rest/ApiController.java
18 18
import java.time.format.DateTimeFormatter;
19 19
import java.util.List;
20 20

  
21
import static org.springframework.web.bind.annotation.RequestMethod.*;
22

  
23 21
@RestController
24 22
public class ApiController {
25 23

  
......
35 33

  
36 34
    // *********************** GET ****************************
37 35

  
38
    @RequestMapping(value = "/users/requests/vacation", method=GET)
36
    @GetMapping("/users/requests/vacation")
39 37
    public List<VacationRequest> usersRequestsVacation(
40 38
            @RequestParam(value = "lang", required = false) String lang,
41 39
            @RequestParam(value = "status", required = false) Status status)
......
43 41
        return manager.getVacationRequests(status);
44 42
    }
45 43

  
46
    @RequestMapping(value = "/users/requests/authorization", method=GET)
44
    @GetMapping("/users/requests/authorization")
47 45
    public List<AuthorizationRequest> userRequestsAuthorization(
48 46
            @RequestParam(value = "lang", required = false) String lang,
49 47
            @RequestParam(value = "status", required = false) Status status)
......
51 49
        return manager.getAuthorizationRequests(status);
52 50
    }
53 51

  
54
    @RequestMapping(value = "/user/{id}/calendar", method=GET)
52
    @GetMapping("/user/{id}/calendar")
55 53
    public List<VacationDay> userCalendar(
56 54
            @PathVariable("id") Long id,
57 55
            @RequestParam(value = "lang", required = false) String lang,
......
65 63
        return manager.getUserCalendar(id, fromDate, toDate, status);
66 64
    }
67 65

  
68
    @RequestMapping(value = "/settings", method=GET)
66
    @GetMapping("/settings")
69 67
    public DefaultSettings settings(
70 68
            @RequestParam(value = "lang", required = false) String lang)
71 69
    {
......
74 72

  
75 73
    // *********************** POST ****************************
76 74

  
77
    @RequestMapping(value = "/settings", method=POST)
75
    @PostMapping("/settings")
78 76
    public ResponseEntity<Void> settings(
79 77
            @RequestParam(value = "lang", required = false) String lang,
80 78
            @RequestBody DefaultSettings settings)
......
84 82
        return ResponseEntity.ok().build();
85 83
    }
86 84

  
87
    @RequestMapping(value = "/user/calendar/create", method=POST)
85
    @PostMapping("/user/calendar/create")
88 86
    public ResponseEntity<Void> userCalendarCreate(
89 87
            @RequestParam(value = "lang", required = false) String lang,
90 88
            @RequestBody VacationDay vacationDay,
......
100 98
    // *********************** PUT ****************************
101 99

  
102 100

  
103
    @RequestMapping(value = "/user/settings", method=PUT)
101
    @PutMapping("/user/settings")
104 102
    public ResponseEntity<Void> userSettings(
105 103
            @RequestParam(value = "lang", required = false) String lang,
106 104
            @RequestBody UserSettings settings,
......
113 111
        return ResponseEntity.ok().build();
114 112
    }
115 113

  
116
    @RequestMapping(value = "/user/calendar/edit", method=PUT)
114
    @PutMapping("/user/calendar/edit")
117 115
    public ResponseEntity<Void> userCalendarEdit(
118 116
            @RequestParam(value = "lang", required = false) String lang,
119 117
            @RequestBody VacationDay vacationDay)
......
125 123
        return ResponseEntity.ok().build();
126 124
    }
127 125

  
128
    @RequestMapping(value = "/user/requests", method=PUT)
126
    @PutMapping("/user/requests")
129 127
    public ResponseEntity<Void> userRequests(
130 128
            @RequestParam(value = "lang", required = false) String lang,
131 129
            @RequestParam(value = "type") RequestType type,
......
138 136

  
139 137
    // *********************** DELETE ****************************
140 138

  
141
    @RequestMapping(value = "/calendar/{id}/delete", method=DELETE)
139
    @DeleteMapping("/calendar/{id}/delete")
142 140
    public ResponseEntity<Void> calendarDelete(
143 141
            @PathVariable("id") Long id,
144 142
            @RequestParam(value = "lang", required = false) String lang)
......
150 148

  
151 149
    // *********************** FILE ****************************
152 150

  
153
    @RequestMapping(value = "/import/xls", method=POST)
151
    @PostMapping("/import/xls")
154 152
    public ResponseEntity<Void> importXLSFile(@RequestParam(value = "lang", required = false) String lang, @RequestParam("file") MultipartFile file) throws Exception {
155 153
        fileService.parseXLSFile(file.getOriginalFilename(), file.getBytes());
156 154

  
157 155
        return ResponseEntity.ok().build();
158 156
    }
159 157

  
160
    @RequestMapping(value = "/export/pdf", method=GET)
158
    @GetMapping("/export/pdf")
161 159
    public ResponseEntity<byte[]> exportPDFFile(@RequestParam(value = "lang", required = false) String lang) throws Exception {
162 160
        FileExportResult result = fileService.createPDFFile();
163 161

  

Také k dispozici: Unified diff