archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8284112: Minor cleanup could be done in javax.crypto

Browse source 
Reviewed-by: wetmore
This commit is contained in:
Mark Powers 2022-04-18 23:48:22 +00:00 • committed by Bradford Wetmore
parent 897d6c0dc7
commit 41fc078323
37 changed files with 204 additions and 270 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/java.base/share/classes/javax/crypto/CryptoPolicyParser.java
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2022, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -66,7 +66,7 @@ import java.lang.reflect.*;
final class CryptoPolicyParser {
private Vector<GrantEntry> grantEntries;
private final Vector<GrantEntry> grantEntries;
// Convenience variables for parsing
private StreamTokenizer st;
@ -76,7 +76,7 @@ final class CryptoPolicyParser {
* Creates a CryptoPolicyParser object.
*/
CryptoPolicyParser() {
grantEntries = new Vector<GrantEntry>();
grantEntries = new Vector<>();
}
/**
@ -141,8 +141,7 @@ final class CryptoPolicyParser {
while (lookahead != StreamTokenizer.TT_EOF) {
if (peek("grant")) {
GrantEntry ge = parseGrantEntry(processedPermissions);
if (ge != null)
grantEntries.addElement(ge);
grantEntries.addElement(ge);
} else {
throw new ParsingException(st.lineno(), "expected grant " +
"statement");
@ -280,11 +279,11 @@ final class CryptoPolicyParser {
return e;
}
private static final AlgorithmParameterSpec getInstance(String type,
Integer[] params)
private static AlgorithmParameterSpec getInstance(String type,
Integer[] params)
throws ParsingException
{
AlgorithmParameterSpec ret = null;
AlgorithmParameterSpec ret;
try {
Class<?> apsClass = Class.forName(type);
@ -496,7 +495,7 @@ final class CryptoPolicyParser {
exemptionMechanism == null ? "none" : exemptionMechanism;
if (processedPermissions == null) {
processedPermissions = new Hashtable<String, Vector<String>>();
processedPermissions = new Hashtable<>();
Vector<String> exemptionMechanisms = new Vector<>(1);
exemptionMechanisms.addElement(thisExemptionMechanism);
processedPermissions.put(alg, exemptionMechanisms);
@ -515,7 +514,7 @@ final class CryptoPolicyParser {
return false;
}
} else {
exemptionMechanisms = new Vector<String>(1);
exemptionMechanisms = new Vector<>(1);
}
exemptionMechanisms.addElement(thisExemptionMechanism);
@ -553,10 +552,10 @@ final class CryptoPolicyParser {
private static class GrantEntry {
private Vector<CryptoPermissionEntry> permissionEntries;
private final Vector<CryptoPermissionEntry> permissionEntries;
GrantEntry() {
permissionEntries = new Vector<CryptoPermissionEntry>();
permissionEntries = new Vector<>();
}
void add(CryptoPermissionEntry pe)
@ -643,11 +642,9 @@ final class CryptoPolicyParser {
if (obj == this)
return true;
if (!(obj instanceof CryptoPermissionEntry))
if (!(obj instanceof CryptoPermissionEntry that))
return false;
CryptoPermissionEntry that = (CryptoPermissionEntry) obj;
if (this.cryptoPermission == null) {
if (that.cryptoPermission != null) return false;
} else {
@ -668,14 +665,10 @@ final class CryptoPolicyParser {
if (this.checkParam != that.checkParam) return false;
if (this.algParamSpec == null) {
if (that.algParamSpec != null) return false;
return that.algParamSpec == null;
} else {
if (!this.algParamSpec.equals(that.algParamSpec))
return false;
return this.algParamSpec.equals(that.algParamSpec);
}
// everything matched -- the 2 objects are equal
return true;
}
}