Skip to content

Commit e6e9bd2

Browse files
author
Justin Brinegar
committed
rename away from "getSubject"
1 parent e25881e commit e6e9bd2

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
import java.security.AccessController;
2424

2525
/**
26-
* Calls Subject.getSubject() directly, as this class should not be classloaded on Java 18 and above
26+
* Calls Subject methods directly, as this class should not be classloaded on Java 18 and above
2727
*/
28-
class ClassicGetSubject implements HiddenGetSubject {
28+
class ClassicSubjectAdapter implements HiddenSubjectAdapter {
2929

30-
ClassicGetSubject() {}
30+
ClassicSubjectAdapter() {}
3131

3232
@Override
3333
public Subject getSubject() {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020

2121
import javax.security.auth.Subject;
2222

23-
public interface HiddenGetSubject {
23+
public interface HiddenSubjectAdapter {
2424
Subject getSubject();
2525
}

hadoop-common-project/hadoop-auth/src/main/java/org/apache/hadoop/util/subject/SubjectAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
*/
3131
public class SubjectAdapter {
3232
private static Logger log = LoggerFactory.getLogger(SubjectAdapter.class);
33-
private static final HiddenGetSubject instance;
33+
private static final HiddenSubjectAdapter instance;
3434
static {
3535
int version = 0;
3636
try {
3737
version = Integer.parseInt(System.getProperty("java.specification.version"));
3838
} catch (Throwable ignored) {}
3939
if (version >= 18) {
40-
instance = new GetSubjectJava18AndAbove();
40+
instance = new SubjectAdapterJava18AndAbove();
4141
} else {
42-
instance = new ClassicGetSubject();
42+
instance = new ClassicSubjectAdapter();
4343
}
4444
}
4545

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
/**
2626
* Indirectly calls Subject.current(), which exists in Java 18 and above only
2727
*/
28-
class GetSubjectJava18AndAbove implements HiddenGetSubject {
28+
class SubjectAdapterJava18AndAbove implements HiddenSubjectAdapter {
2929
private final Method currentMethod;
3030

31-
GetSubjectJava18AndAbove() {
31+
SubjectAdapterJava18AndAbove() {
3232
try {
3333
currentMethod = Subject.class.getMethod("current");
3434
} catch (NoSuchMethodException e) {

0 commit comments

Comments
 (0)