Skip to content

Commit 52a35f1

Browse files
committed
concord-server: rename method
1 parent 449372f commit 52a35f1

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

server/impl/src/main/java/com/walmartlabs/concord/server/security/SecurityUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static Subject assertSubject() {
7878
return subject;
7979
}
8080

81-
public static <T> T getCurrent(Class<T> type) {
81+
public static <T> T getPrincipal(Class<T> type) {
8282
SecurityManager securityManager = ThreadContext.getSecurityManager();
8383
if (securityManager == null) {
8484
return null;
@@ -97,8 +97,8 @@ public static <T> T getCurrent(Class<T> type) {
9797
return principals.oneByType(type);
9898
}
9999

100-
public static <T> T assertCurrent(Class<T> type) {
101-
T p = getCurrent(type);
100+
public static <T> T assertPrincipal(Class<T> type) {
101+
T p = getPrincipal(type);
102102
if (p == null) {
103103
throw new AuthenticationException("Can't determine the current principal (" + type.getName() + ")");
104104
}

server/impl/src/main/java/com/walmartlabs/concord/server/security/UserPrincipal.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ public class UserPrincipal implements Serializable {
3737
private static final long serialVersionUID = 1L;
3838

3939
public static UserPrincipal getCurrent() {
40-
return SecurityUtils.getCurrent(UserPrincipal.class);
40+
return SecurityUtils.getPrincipal(UserPrincipal.class);
4141
}
4242

4343
public static UserPrincipal assertCurrent() {
44-
return SecurityUtils.assertCurrent(UserPrincipal.class);
44+
return SecurityUtils.assertPrincipal(UserPrincipal.class);
4545
}
4646

4747
private final String realm;

server/impl/src/main/java/com/walmartlabs/concord/server/security/github/GithubKey.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
public class GithubKey implements AuthenticationToken {
2929

3030
public static GithubKey getCurrent() {
31-
return SecurityUtils.getCurrent(GithubKey.class);
31+
return SecurityUtils.getPrincipal(GithubKey.class);
3232
}
3333

3434
private static final long serialVersionUID = 1L;

server/impl/src/main/java/com/walmartlabs/concord/server/security/ldap/LdapPrincipal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public LdapPrincipal(String username,
6363
}
6464

6565
public static LdapPrincipal getCurrent() {
66-
return SecurityUtils.getCurrent(LdapPrincipal.class);
66+
return SecurityUtils.getPrincipal(LdapPrincipal.class);
6767
}
6868

6969
public String getUsername() {

server/impl/src/main/java/com/walmartlabs/concord/server/security/sessionkey/SessionKeyPrincipal.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
public class SessionKeyPrincipal {
2727

2828
public static SessionKeyPrincipal getCurrent() {
29-
return SecurityUtils.getCurrent(SessionKeyPrincipal.class);
29+
return SecurityUtils.getPrincipal(SessionKeyPrincipal.class);
3030
}
3131

3232
private final PartialProcessKey processKey;

0 commit comments

Comments
 (0)