Skip to content

Commit c5669e7

Browse files
Default registration parameter to zero UUID
Co-authored-by: thomasturrell <1552612+thomasturrell@users.noreply.github.com>
1 parent 5f45902 commit c5669e7

1 file changed

Lines changed: 8 additions & 6 deletions

File tree

samples/xapi-server/src/main/java/dev/learning/xapi/samples/xapiserver/StateController.java

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
@RequestMapping(value = "/xapi/activities/state")
4040
public class StateController {
4141

42+
private static final UUID ZERO_UUID = new UUID(0L, 0L);
43+
4244
Logger log = LoggerFactory.getLogger(StateController.class);
4345

4446
private final StateService stateService;
@@ -64,7 +66,7 @@ public StateController(StateService stateService) {
6466
public ResponseEntity<String> getState(@RequestParam(required = true) String activityId,
6567
@Valid @RequestParam(required = true) Agent agent,
6668
@RequestParam(required = true) String stateId,
67-
@RequestParam(required = false) UUID registration) {
69+
@RequestParam(defaultValue = "00000000-0000-0000-0000-000000000000") UUID registration) {
6870

6971
log.debug("GET state");
7072

@@ -95,7 +97,7 @@ public ResponseEntity<String> getState(@RequestParam(required = true) String act
9597
public ResponseEntity<List<String>> getStateIds(
9698
@RequestParam(required = true) String activityId,
9799
@Valid @RequestParam(required = true) Agent agent,
98-
@RequestParam(required = false) UUID registration) {
100+
@RequestParam(defaultValue = "00000000-0000-0000-0000-000000000000") UUID registration) {
99101

100102
log.debug("GET state ids");
101103

@@ -122,7 +124,7 @@ public ResponseEntity<List<String>> getStateIds(
122124
public ResponseEntity<Void> putState(@RequestParam(required = true) String activityId,
123125
@Valid @RequestParam(required = true) Agent agent,
124126
@RequestParam(required = true) String stateId,
125-
@RequestParam(required = false) UUID registration,
127+
@RequestParam(defaultValue = "00000000-0000-0000-0000-000000000000") UUID registration,
126128
@RequestHeader(value = HttpHeaders.CONTENT_TYPE,
127129
defaultValue = MediaType.APPLICATION_JSON_VALUE) String contentType,
128130
@RequestBody String stateDocument) {
@@ -152,7 +154,7 @@ public ResponseEntity<Void> putState(@RequestParam(required = true) String activ
152154
public ResponseEntity<Void> postState(@RequestParam(required = true) String activityId,
153155
@Valid @RequestParam(required = true) Agent agent,
154156
@RequestParam(required = true) String stateId,
155-
@RequestParam(required = false) UUID registration,
157+
@RequestParam(defaultValue = "00000000-0000-0000-0000-000000000000") UUID registration,
156158
@RequestHeader(value = HttpHeaders.CONTENT_TYPE,
157159
defaultValue = MediaType.APPLICATION_JSON_VALUE) String contentType,
158160
@RequestBody String stateDocument) {
@@ -181,7 +183,7 @@ public ResponseEntity<Void> postState(@RequestParam(required = true) String acti
181183
public ResponseEntity<Void> deleteState(@RequestParam(required = true) String activityId,
182184
@Valid @RequestParam(required = true) Agent agent,
183185
@RequestParam(required = true) String stateId,
184-
@RequestParam(required = false) UUID registration) {
186+
@RequestParam(defaultValue = "00000000-0000-0000-0000-000000000000") UUID registration) {
185187

186188
log.debug("DELETE state");
187189

@@ -205,7 +207,7 @@ public ResponseEntity<Void> deleteState(@RequestParam(required = true) String ac
205207
@DeleteMapping(params = {"activityId", "agent", "!stateId"})
206208
public ResponseEntity<Void> deleteStates(@RequestParam(required = true) String activityId,
207209
@Valid @RequestParam(required = true) Agent agent,
208-
@RequestParam(required = false) UUID registration) {
210+
@RequestParam(defaultValue = "00000000-0000-0000-0000-000000000000") UUID registration) {
209211

210212
log.debug("DELETE states");
211213

0 commit comments

Comments
 (0)