Skip to content

Commit 46116ee

Browse files
imretoth-essimretoth-ess
committed
Fix review comments
1 parent 1123608 commit 46116ee

File tree

5 files changed

+25
-29
lines changed

5 files changed

+25
-29
lines changed

‎src/main/java/org/phoebus/channelfinder/ChannelManager.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public class ChannelManager {
8181
value = {
8282
@ApiResponse(
8383
responseCode = "200",
84-
description = "List of all channels",
84+
description = "List of channels",
8585
content = @Content(
8686
array = @ArraySchema(schema = @Schema(implementation = Channel.class)))),
8787
@ApiResponse(
@@ -138,7 +138,7 @@ public SearchResult combinedQuery(@RequestParam MultiValueMap<String, String> al
138138
value = {
139139
@ApiResponse(
140140
responseCode = "200",
141-
description = "Number of channels that matches the criteria",
141+
description = "The number of channels matching the query",
142142
content = @Content(schema = @Schema(implementation = Long.class))),
143143
@ApiResponse(
144144
responseCode = "500",
@@ -161,7 +161,7 @@ public long queryCount(@RequestParam MultiValueMap<String, String> allRequestPar
161161
value = {
162162
@ApiResponse(
163163
responseCode = "200",
164-
description = "Channels with the desired name",
164+
description = "Channel with the specified name",
165165
content = @Content(schema = @Schema(implementation = Channel.class))),
166166
@ApiResponse(
167167
responseCode = "404",
@@ -203,7 +203,7 @@ public Channel read(@PathVariable("channelName") String channelName) {
203203
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
204204
@ApiResponse(
205205
responseCode = "401",
206-
description = "Authorization problem",
206+
description = "Unauthorized",
207207
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
208208
@ApiResponse(
209209
responseCode = "404",
@@ -267,7 +267,7 @@ public Channel create(@PathVariable("channelName") String channelName, @RequestB
267267
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
268268
@ApiResponse(
269269
responseCode = "401",
270-
description = "Authorization problem",
270+
description = "Unauthorized",
271271
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
272272
@ApiResponse(
273273
responseCode = "404",
@@ -367,7 +367,7 @@ private void resetOwnersToExisting(Iterable<Channel> channels) {
367367
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
368368
@ApiResponse(
369369
responseCode = "401",
370-
description = "Authorization problem",
370+
description = "Unauthorized",
371371
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
372372
@ApiResponse(
373373
responseCode = "404",
@@ -446,7 +446,7 @@ public Channel update(@PathVariable("channelName") String channelName, @RequestB
446446
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
447447
@ApiResponse(
448448
responseCode = "401",
449-
description = "Authorization problem",
449+
description = "Unauthorized",
450450
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
451451
@ApiResponse(
452452
responseCode = "404",
@@ -508,13 +508,9 @@ public Iterable<Channel> update(@RequestBody Iterable<Channel> channels) {
508508
@ApiResponse(
509509
responseCode = "200",
510510
description = "Channel deleted"),
511-
@ApiResponse(
512-
responseCode = "400",
513-
description = "Invalid request",
514-
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
515511
@ApiResponse(
516512
responseCode = "401",
517-
description = "Authorization problem",
513+
description = "Unauthorized",
518514
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
519515
@ApiResponse(
520516
responseCode = "404",

‎src/main/java/org/phoebus/channelfinder/ChannelScroll.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public class ChannelScroll {
6666
value = {
6767
@ApiResponse(
6868
responseCode = "200",
69-
description = "List of channels",
69+
description = "Scroll that contains a collection of channel instances",
7070
content = @Content(schema = @Schema(implementation = Scroll.class))),
7171
@ApiResponse(
7272
responseCode = "500",
@@ -90,7 +90,7 @@ public Scroll query(@RequestParam MultiValueMap<String, String> allRequestParams
9090
value = {
9191
@ApiResponse(
9292
responseCode = "200",
93-
description = "List of channels",
93+
description = "Scroll List of channels",
9494
content = @Content(schema = @Schema(implementation = Scroll.class))),
9595
@ApiResponse(
9696
responseCode = "500",

‎src/main/java/org/phoebus/channelfinder/PropertyManager.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public Property read(@PathVariable("propertyName") String propertyName,
142142
content = @Content(schema = @Schema(implementation = Property.class))),
143143
@ApiResponse(
144144
responseCode = "401",
145-
description = "Authorization problem",
145+
description = "Unauthorized",
146146
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
147147
@ApiResponse(
148148
responseCode = "404",
@@ -211,7 +211,7 @@ public Property create(@PathVariable("propertyName") String propertyName, @Reque
211211
content = @Content(schema = @Schema(implementation = Property.class))),
212212
@ApiResponse(
213213
responseCode = "401",
214-
description = "Authorization problem",
214+
description = "Unauthorized",
215215
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
216216
@ApiResponse(
217217
responseCode = "500",
@@ -291,7 +291,7 @@ public Iterable<Property> create(@RequestBody Iterable<Property> properties) {
291291
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
292292
@ApiResponse(
293293
responseCode = "401",
294-
description = "Authorization problem",
294+
description = "Unauthorized",
295295
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
296296
@ApiResponse(
297297
responseCode = "404",
@@ -365,7 +365,7 @@ public Property addSingle(@PathVariable("propertyName") String propertyName, @Pa
365365
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
366366
@ApiResponse(
367367
responseCode = "401",
368-
description = "Authorization problem",
368+
description = "Unauthorized",
369369
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
370370
@ApiResponse(
371371
responseCode = "404",
@@ -486,7 +486,7 @@ public Property update(@PathVariable("propertyName") String propertyName, @Reque
486486
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
487487
@ApiResponse(
488488
responseCode = "401",
489-
description = "Authorization problem",
489+
description = "Unauthorized",
490490
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
491491
@ApiResponse(
492492
responseCode = "404",
@@ -591,7 +591,7 @@ private void checkPropertyAuthorization(Optional<Property> existingProperty) {
591591
description = "Property deleted"),
592592
@ApiResponse(
593593
responseCode = "401",
594-
description = "Authorization problem",
594+
description = "Unauthorized",
595595
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
596596
@ApiResponse(
597597
responseCode = "404",
@@ -643,7 +643,7 @@ public void remove(@PathVariable("propertyName") String propertyName) {
643643
description = "Property deleted from the channel"),
644644
@ApiResponse(
645645
responseCode = "401",
646-
description = "Authorization problem",
646+
description = "Unauthorized",
647647
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
648648
@ApiResponse(
649649
responseCode = "404",

‎src/main/java/org/phoebus/channelfinder/TagManager.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public Tag read(@PathVariable("tagName") String tagName,
147147
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
148148
@ApiResponse(
149149
responseCode = "401",
150-
description = "Authorization problem",
150+
description = "Unauthorized",
151151
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
152152
@ApiResponse(
153153
responseCode = "404",
@@ -226,7 +226,7 @@ public Tag create(@PathVariable("tagName") String tagName, @RequestBody Tag tag)
226226
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
227227
@ApiResponse(
228228
responseCode = "401",
229-
description = "Authorization problem",
229+
description = "Unauthorized",
230230
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
231231
@ApiResponse(
232232
responseCode = "404",
@@ -326,7 +326,7 @@ public Iterable<Tag> create(@RequestBody Iterable<Tag> tags) {
326326
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
327327
@ApiResponse(
328328
responseCode = "401",
329-
description = "Authorization problem",
329+
description = "Unauthorized",
330330
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
331331
@ApiResponse(
332332
responseCode = "404",
@@ -398,7 +398,7 @@ public Tag addSingle(@PathVariable("tagName") String tagName, @PathVariable("cha
398398
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
399399
@ApiResponse(
400400
responseCode = "401",
401-
description = "Authorization problem",
401+
description = "Unauthorized",
402402
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
403403
@ApiResponse(
404404
responseCode = "404",
@@ -498,7 +498,7 @@ public Tag update(@PathVariable("tagName") String tagName, @RequestBody Tag tag)
498498
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
499499
@ApiResponse(
500500
responseCode = "401",
501-
description = "Authorization problem",
501+
description = "Unauthorized",
502502
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
503503
@ApiResponse(
504504
responseCode = "404",
@@ -585,7 +585,7 @@ public Iterable<Tag> update(@RequestBody Iterable<Tag> tags) {
585585
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
586586
@ApiResponse(
587587
responseCode = "401",
588-
description = "Authorization problem",
588+
description = "Unauthorized",
589589
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
590590
@ApiResponse(
591591
responseCode = "404",
@@ -641,7 +641,7 @@ public void remove(@PathVariable("tagName") String tagName) {
641641
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
642642
@ApiResponse(
643643
responseCode = "401",
644-
description = "Authorization problem",
644+
description = "Unauthorized",
645645
content = @Content(schema = @Schema(implementation = ResponseStatusException.class))),
646646
@ApiResponse(
647647
responseCode = "404",

‎src/main/java/org/phoebus/channelfinder/processors/ChannelProcessorManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public List<String> processorInfo() {
8686
content = @Content(schema = @Schema(implementation = Long.class))),
8787
@ApiResponse(
8888
responseCode = "401",
89-
description = "Authorization problem",
89+
description = "Unauthorized",
9090
content = @Content(schema = @Schema(implementation = ResponseStatusException.class)))
9191
})
9292
@PutMapping("/process/all")

0 commit comments

Comments
 (0)