Skip to content

Commit 2175c84

Browse files
committed
Remove superfluous javadoc comments
1 parent 93cd86f commit 2175c84

File tree

6 files changed

+1
-244
lines changed

6 files changed

+1
-244
lines changed

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

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,6 @@ public class ChannelManager {
7070
@Autowired
7171
ChannelProcessorService channelProcessorService;
7272

73-
/**
74-
* GET method for querying a collection of Channel instances, based on a
75-
* multi-parameter query specifying patterns for tags, property values, and
76-
* channel names to match against.
77-
*
78-
* @param allRequestParams query parameters
79-
* @return list of all channels
80-
*/
8173
@Operation(
8274
summary = "Query channels",
8375
description = "Query a collection of Channel instances based on tags, property values, and channel names.",
@@ -105,14 +97,6 @@ public List<Channel> query(@RequestParam MultiValueMap<String, String> allReques
10597
return channelRepository.search(allRequestParams).channels();
10698
}
10799

108-
/**
109-
* GET method for querying for a collection of Channel instances, based on a
110-
* multi-parameter query specifying patterns for tags, property values, and
111-
* channel names to match against.
112-
*
113-
* @param allRequestParams query parameters
114-
* @return SearchResult a count to the total number of matches and the first 10k hits
115-
*/
116100
@Operation(
117101
summary = "Combined query for channels",
118102
description = "Query for a collection of Channel instances and get a count and the first 10k hits.",
@@ -140,13 +124,6 @@ public SearchResult combinedQuery(@RequestParam MultiValueMap<String, String> al
140124
return channelRepository.search(allRequestParams);
141125
}
142126

143-
/**
144-
* GET method for querying the number of matches to a multi-parameter query specifying patterns for tags, property values, and
145-
* channel names to match against.
146-
*
147-
* @param allRequestParams query parameters
148-
* @return a total number of channels that match the query parameters
149-
*/
150127
@Operation(
151128
summary = "Count channels matching query",
152129
description = "Get the number of channels matching the given query parameters.",
@@ -169,13 +146,6 @@ public long queryCount(@RequestParam MultiValueMap<String, String> allRequestPar
169146
return channelRepository.count(allRequestParams);
170147
}
171148

172-
/**
173-
* GET method for retrieving an instance of Channel identified by
174-
* <code>channelName</code>.
175-
*
176-
* @param channelName - channel name to search for
177-
* @return found channel
178-
*/
179149
@Operation(
180150
summary = "Get channel by name",
181151
description = "Retrieve a Channel instance by its name.",
@@ -207,15 +177,6 @@ public Channel read(@PathVariable("channelName") String channelName) {
207177
}
208178
}
209179

210-
/**
211-
* PUT method for creating/replacing a channel instance identified by the
212-
* payload. The <b>complete</b> set of properties for the channel must be
213-
* supplied, which will replace the existing set of properties.
214-
*
215-
* @param channelName - name of channel to be created
216-
* @param channel - new data (properties/tags) for channel <code>chan</code>
217-
* @return the created channel
218-
*/
219180
@Operation(
220181
summary = "Create or replace a channel",
221182
description = "Create or replace a channel instance identified by the payload.",
@@ -279,12 +240,6 @@ public Channel create(@PathVariable("channelName") String channelName, @RequestB
279240
}
280241
}
281242

282-
/**
283-
* PUT method for creating multiple channels.
284-
*
285-
* @param channels - XmlChannels to be created
286-
* @return the list of channels created
287-
*/
288243
@Operation(
289244
summary = "Create or replace multiple channels",
290245
description = "Create or replace multiple channel instances.",
@@ -384,14 +339,6 @@ private void resetOwnersToExisting(Iterable<Channel> channels) {
384339
}
385340
}
386341

387-
/**
388-
* POST method for merging properties and tags of the channel identified by the
389-
* payload into an existing channel.
390-
*
391-
* @param channelName - name of channel to add
392-
* @param channel - new Channel data (properties/tags) to be merged into channel <code>channelName</code>
393-
* @return the updated channel
394-
*/
395342
@Operation(
396343
summary = "Update a channel",
397344
description = "Merge properties and tags of the channel identified by the payload into an existing channel.",
@@ -470,13 +417,6 @@ public Channel update(@PathVariable("channelName") String channelName, @RequestB
470417
}
471418
}
472419

473-
/**
474-
* POST method for merging properties and tags of the Channels identified by the
475-
* payload into existing channels.
476-
*
477-
* @param channels - XmlChannels to be updated
478-
* @return the updated channels
479-
*/
480420
@Operation(
481421
summary = "Update multiple channels",
482422
description = "Merge properties and tags of the channels identified by the payload into existing channels.",
@@ -546,12 +486,6 @@ public Iterable<Channel> update(@RequestBody Iterable<Channel> channels) {
546486
}
547487
}
548488

549-
/**
550-
* DELETE method for deleting a channel instance identified by path parameter
551-
* <code>channelName</code>.
552-
*
553-
* @param channelName - name of channel to remove
554-
*/
555489
@Operation(
556490
summary = "Delete a channel",
557491
description = "Delete a channel instance identified by its name.",

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,6 @@ public class ChannelScroll {
5555
@Qualifier("indexClient")
5656
ElasticsearchClient client;
5757

58-
/**
59-
* GET method for retrieving a collection of Channel instances, based on a
60-
* multi-parameter query specifying patterns for tags, property values, and
61-
* channel names to match against.
62-
*
63-
* @param allRequestParams search parameters
64-
* @return list of all channels
65-
*/
6658
@Operation(
6759
summary = "Scroll query for channels",
6860
description = "Retrieve a collection of Channel instances based on multi-parameter search.",
@@ -85,14 +77,6 @@ public Scroll query(@RequestParam MultiValueMap<String, String> allRequestParams
8577
return search(null, allRequestParams);
8678
}
8779

88-
/**
89-
* GET method for retrieving a collection of Channel instances, based on a
90-
* multi-parameter query specifying patterns for tags, property values, and
91-
* channel names to match against.
92-
*
93-
* @param scrollId scroll Id
94-
* @return list of all channels
95-
*/
9680
@Operation(
9781
summary = "Scroll query by scrollId",
9882
description = "Retrieve a collection of Channel instances using a scrollId and search parameters.",

src/main/java/org/phoebus/channelfinder/InfoManager.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,6 @@ public class InfoManager {
4242

4343
private static final ObjectMapper objectMapper = new ObjectMapper().enable(SerializationFeature.INDENT_OUTPUT);
4444

45-
/**
46-
*
47-
* @return Information about the ChannelFinder service
48-
*/
4945
@Operation(
5046
summary = "Get ChannelFinder service info",
5147
description = "Returns information about the ChannelFinder service and its Elasticsearch backend.",

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

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,6 @@ public class PropertyManager {
6060
@Autowired
6161
AuthorizationService authorizationService;
6262

63-
/**
64-
* GET method for retrieving the list of properties in the database.
65-
*
66-
* @return list of all properties
67-
*/
6863
@Operation(
6964
summary = "List all properties",
7065
description = "Retrieve the list of all properties in the database.",
@@ -89,15 +84,6 @@ public Iterable<Property> list() {
8984
return propertyRepository.findAll();
9085
}
9186

92-
/**
93-
* GET method for retrieving the property with the path parameter <code>propertyName</code>
94-
* <p>
95-
* To get all its channels use the parameter "withChannels"
96-
*
97-
* @param propertyName - property name to search for
98-
* @param withChannels - get the channels with the property
99-
* @return found property
100-
*/
10187
@Operation(
10288
summary = "Get property by name",
10389
description = "Retrieve a property by its name. Optionally include its channels.",
@@ -135,18 +121,6 @@ public Property read(@PathVariable("propertyName") String propertyName,
135121
}
136122
}
137123

138-
/**
139-
* PUT method for creating and <b>exclusively</b> adding the property
140-
* identified by the path parameter <code>propertyName</code> to all channels
141-
* identified by the payload structure <code>property</code>. Setting the owner
142-
* attribute in the XML root element is mandatory. Values for the properties
143-
* are taken from the payload.
144-
*
145-
*
146-
* @param propertyName - name of property to be created
147-
* @param property - an Property instance with the list of channels to add the property <code>propertyName</code> to
148-
* @return the created property
149-
*/
150124
@Operation(
151125
summary = "Create or update a property",
152126
description = "Create and exclusively update the property identified by the path parameter.",
@@ -216,12 +190,6 @@ public Property create(@PathVariable("propertyName") String propertyName, @Reque
216190
}
217191
}
218192

219-
/**
220-
* PUT method for creating multiple properties.
221-
*
222-
* @param properties - XmlProperties to be created
223-
* @return the list of properties created
224-
*/
225193
@Operation(
226194
summary = "Create multiple properties",
227195
description = "Create multiple properties in a single request.",
@@ -292,18 +260,6 @@ public Iterable<Property> create(@RequestBody Iterable<Property> properties) {
292260
}
293261
}
294262

295-
/**
296-
* PUT method for adding the property identified by <code>property</code> to the single
297-
* channel <code>chan</code> (both path parameters).
298-
*
299-
* TODO: could be simplified with multi index update and script which can use
300-
* wildcards thus removing the need to explicitly define the entire property
301-
*
302-
* @param propertyName - name of tag to be created
303-
* @param channelName - channel to update <code>property</code> to
304-
* @param property - property payload with value
305-
* @return added property
306-
*/
307263
@Operation(
308264
summary = "Add property to a single channel",
309265
description = "Add the property identified by propertyName to the channel identified by channelName.",
@@ -374,16 +330,6 @@ public Property addSingle(@PathVariable("propertyName") String propertyName, @Pa
374330
}
375331
}
376332

377-
/**
378-
* POST method for updating the property identified by the path parameter
379-
* <code>propertyName</code>, adding it to all channels identified by the payload structure
380-
* <code>property</code>. Setting the owner attribute in the XML root element is
381-
* mandatory. Values for the properties are taken from the payload.
382-
*
383-
* @param propertyName - name of property to be updated
384-
* @param property - a Property instance with the list of channels to add the property <code>propertyName</code> to
385-
* @return the updated property
386-
*/
387333
@Operation(
388334
summary = "Update a property",
389335
description = "Update the property identified by the path parameter, adding it to all channels in the payload.",
@@ -498,18 +444,8 @@ public Property update(@PathVariable("propertyName") String propertyName, @Reque
498444
}
499445

500446
return updatedProperty;
501-
502447
}
503448

504-
/**
505-
* POST method for updating multiple properties and updating all the appropriate
506-
* channels.
507-
*
508-
* If the channels don't exist it will fail
509-
*
510-
* @param properties - XmlProperties to be updated
511-
* @return the updated properties
512-
*/
513449
@Operation(
514450
summary = "Update multiple properties",
515451
description = "Update multiple properties and all appropriate channels.",
@@ -621,12 +557,6 @@ private void checkPropertyAuthorization(Optional<Property> existingProperty) {
621557
}
622558
}
623559

624-
/**
625-
* DELETE method for deleting the property identified by the path parameter
626-
* <code>propertyName</code> from all channels.
627-
*
628-
* @param propertyName - name of property to remove
629-
*/
630560
@Operation(
631561
summary = "Delete a property",
632562
description = "Delete the property identified by the path parameter from all channels.",
@@ -678,13 +608,6 @@ public void remove(@PathVariable("propertyName") String propertyName) {
678608
}
679609
}
680610

681-
/**
682-
* DELETE method for deleting the property identified by <code>propertyName</code> from the
683-
* channel <code>channelName</code> (both path parameters).
684-
*
685-
* @param propertyName - name of property to remove
686-
* @param channelName - channel to remove <code>propertyName</code> from
687-
*/
688611
@Operation(
689612
summary = "Delete property from a channel",
690613
description = "Delete the property identified by propertyName from the channel identified by channelName.",

0 commit comments

Comments
 (0)