Skip to content

Commit 0105200

Browse files
committed
Cosmetic changes
1 parent 65eb10c commit 0105200

File tree

3 files changed

+5
-31
lines changed

3 files changed

+5
-31
lines changed

Issues.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
* When sending null in ServiceMessage.data - now it's throwing BadRequest, but before it was
22
security-exception. Must be changed back to how it was.
3-
* ServicePrincipal - as a second constructor parameter must expect Collection of permissions.
4-
* ServiceRoleDefinition - as a second constructor parameter must expect Collection of permissions.
5-
* VaultServiceRolesInstaller:
6-
* must validate for non-null constructor parameters (check other security classes as well).
7-
* ".key" change to ".identity-key"
83
* Add debug logs for Auth/Authz error situations.
94
* In ServiceMethodInvoker - wrap principalMapper.map(context) into Mono.defer()

services-api/src/main/java/io/scalecube/services/auth/ServicePrincipal.java

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package io.scalecube.services.auth;
22

3-
import java.util.Arrays;
43
import java.util.Collection;
54
import java.util.Objects;
65
import java.util.Set;
@@ -10,16 +9,6 @@ public class ServicePrincipal implements Principal {
109
private final String role;
1110
private final Set<String> permissions;
1211

13-
/**
14-
* Constructor.
15-
*
16-
* @param role service role
17-
* @param permissions service permissions
18-
*/
19-
public ServicePrincipal(String role, String... permissions) {
20-
this(role, Set.copyOf(Arrays.asList(permissions)));
21-
}
22-
2312
/**
2413
* Constructor.
2514
*
@@ -28,7 +17,7 @@ public ServicePrincipal(String role, String... permissions) {
2817
*/
2918
public ServicePrincipal(String role, Set<String> permissions) {
3019
this.role = role;
31-
this.permissions = permissions;
20+
this.permissions = Set.copyOf(permissions);
3221
}
3322

3423
@Override

services-api/src/main/java/io/scalecube/services/methods/ServiceRoleDefinition.java

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package io.scalecube.services.methods;
22

3-
import java.util.Arrays;
3+
import java.util.Collection;
44
import java.util.Objects;
55
import java.util.Set;
66
import java.util.StringJoiner;
@@ -16,26 +16,16 @@ public class ServiceRoleDefinition {
1616
* @param role service role
1717
* @param permissions service permissions
1818
*/
19-
public ServiceRoleDefinition(String role, String... permissions) {
20-
this(role, Set.copyOf(Arrays.asList(permissions)));
21-
}
22-
23-
/**
24-
* Constructor.
25-
*
26-
* @param role service role
27-
* @param permissions service permissions
28-
*/
29-
public ServiceRoleDefinition(String role, Set<String> permissions) {
19+
public ServiceRoleDefinition(String role, Collection<String> permissions) {
3020
this.role = role;
31-
this.permissions = permissions;
21+
this.permissions = Set.copyOf(permissions);
3222
}
3323

3424
public String role() {
3525
return role;
3626
}
3727

38-
public Set<String> permissions() {
28+
public Collection<String> permissions() {
3929
return permissions;
4030
}
4131

0 commit comments

Comments
 (0)