8290975: Minor cleanup could be done in javax.security

Reviewed-by: wetmore, mullan
This commit is contained in:
Mark Powers 2022-08-08 17:30:22 +00:00 committed by Bradford Wetmore
parent 7db5abddd1
commit 08274e6fea
16 changed files with 90 additions and 104 deletions

View file

@ -127,7 +127,7 @@ public final class PrivateCredentialPermission extends Permission {
/**
* @serial
*/
private boolean testing = false;
private final boolean testing = false;
/**
* Create a new {@code PrivateCredentialPermission}
@ -269,11 +269,9 @@ public final class PrivateCredentialPermission extends Permission {
if (obj == this)
return true;
if (! (obj instanceof PrivateCredentialPermission))
if (! (obj instanceof PrivateCredentialPermission that))
return false;
PrivateCredentialPermission that = (PrivateCredentialPermission)obj;
return (this.implies(that) && that.implies(this));
}
@ -316,8 +314,8 @@ public final class PrivateCredentialPermission extends Permission {
ArrayList<CredOwner> pList = new ArrayList<>();
StringTokenizer tokenizer = new StringTokenizer(name, " ", true);
String principalClass = null;
String principalName = null;
String principalClass;
String principalName;
if (testing)
System.out.println("whole name = " + name);
@ -327,7 +325,7 @@ public final class PrivateCredentialPermission extends Permission {
if (testing)
System.out.println("Credential Class = " + credentialClass);
if (tokenizer.hasMoreTokens() == false) {
if (!tokenizer.hasMoreTokens()) {
MessageFormat form = new MessageFormat(ResourcesMgr.getString
("permission.name.name.syntax.invalid."));
Object[] source = {name};
@ -346,7 +344,7 @@ public final class PrivateCredentialPermission extends Permission {
if (testing)
System.out.println(" Principal Class = " + principalClass);
if (tokenizer.hasMoreTokens() == false) {
if (!tokenizer.hasMoreTokens()) {
MessageFormat form = new MessageFormat(ResourcesMgr.getString
("permission.name.name.syntax.invalid."));
Object[] source = {name};
@ -428,7 +426,7 @@ public final class PrivateCredentialPermission extends Permission {
if (thisC.equals("*"))
return true;
/**
/*
* XXX let's not enable this for now --
* if people want it, we'll enable it later
*/
@ -533,7 +531,7 @@ public final class PrivateCredentialPermission extends Permission {
}
}
/**
/*
* XXX no code yet to support a.b.*
*/