mike-jumper commented on a change in pull request #546:
URL: https://github.com/apache/guacamole-client/pull/546#discussion_r513950716
##########
File path:
guacamole/src/main/java/org/apache/guacamole/rest/connection/ConnectionResource.java
##########
@@ -150,18 +153,26 @@ public ConnectionResource(@Assisted UserContext
userContext,
* @throws GuacamoleException
* If an error occurs while retrieving the connection history.
*/
- @GET
+ @SuppressWarnings("deprecation")
@Path("history")
- public List<APIConnectionRecord> getConnectionHistory()
+ public ConnectionHistoryResource getConnectionHistory()
throws GuacamoleException {
- // Retrieve the requested connection's history
- List<APIConnectionRecord> apiRecords = new
ArrayList<APIConnectionRecord>();
- for (ConnectionRecord record : connection.getHistory())
- apiRecords.add(new APIConnectionRecord(record));
-
- // Return the converted history
- return apiRecords;
+ try {
+ return new
ConnectionHistoryResource(connection.getConnectionHistory());
+ }
+ catch (GuacamoleUnsupportedException e) {
+ try {
+ List<ConnectionRecord> history = Collections.emptyList();
+ for (ConnectionRecord record : connection.getHistory()) {
+ history.add(record);
+ }
+ return new ConnectionHistoryResource(new
SimpleActivityRecordSet<>(history));
+ }
+ catch (GuacamoleUnsupportedException ex) {
+ return new ConnectionHistoryResource(new
SimpleActivityRecordSet<>());
+ }
+ }
Review comment:
...unless the intent is that `SimpleActivityRecordSet` will be backed by
the provided `List`, in which case `List<RecordType>` **is** correct. This is
what is done with `SimpleDirectory`:
https://guacamole.apache.org/doc/guacamole-ext/org/apache/guacamole/net/auth/simple/SimpleDirectory.html#SimpleDirectory-java.util.Collection-
I would suggest that the type be `Collection<RecordType>`, though, for API's
sake.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
