safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-1629: Use Java 8 compatible collector to append connection group attributes.

Browse Source
This commit is contained in:
James Muehlner
2022-07-06 19:06:42 +00:00
parent 0585ab5e5b
commit 12832bed88
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
extensions/guacamole-vault/modules/guacamole-vault-base/src/main/java/org/apache/guacamole/vault/user/VaultUserContext.java
View File

@@ -24,6 +24,7 @@ import com.google.inject.assistedinject.Assisted;
import com.google.inject.assistedinject.AssistedInject; import com.google.inject.assistedinject.AssistedInject;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
@@ -430,10 +431,11 @@ public class VaultUserContext extends TokenInjectingUserContext {
public Collection<Form> getConnectionGroupAttributes() { public Collection<Form> getConnectionGroupAttributes() {
// Add any custom attributes to any previously defined attributes // Add any custom attributes to any previously defined attributes
return Stream.concat( return Collections.unmodifiableCollection(Stream.concat(
super.getConnectionGroupAttributes().stream(), super.getConnectionGroupAttributes().stream(),
attributeService.getConnectionGroupAttributes().stream() attributeService.getConnectionGroupAttributes().stream()
).collect(Collectors.toUnmodifiableList()); ).collect(Collectors.toList()));
} }
} }