8268967: Update java.security to use switch expressions

Reviewed-by: xuelei
This commit is contained in:
Patrick Concannon 2021-06-25 16:34:18 +00:00
parent b565459f83
commit 35c4702055
3 changed files with 46 additions and 107 deletions

View file

@ -947,18 +947,12 @@ public abstract class Signature extends SignatureSpi {
* @return a string representation of this signature object.
*/
public String toString() {
String initState = "";
switch (state) {
case UNINITIALIZED:
initState = "<not initialized>";
break;
case VERIFY:
initState = "<initialized for verifying>";
break;
case SIGN:
initState = "<initialized for signing>";
break;
}
String initState = switch (state) {
case UNINITIALIZED -> "<not initialized>";
case VERIFY -> "<initialized for verifying>";
case SIGN -> "<initialized for signing>";
default -> "";
};
return "Signature object: " + getAlgorithm() + initState;
}
@ -1317,26 +1311,13 @@ public abstract class Signature extends SignatureSpi {
AlgorithmParameterSpec params, SecureRandom random)
throws InvalidKeyException, InvalidAlgorithmParameterException {
switch (type) {
case I_PUB:
spi.engineInitVerify((PublicKey)key);
break;
case I_PUB_PARAM:
spi.engineInitVerify((PublicKey)key, params);
break;
case I_PRIV:
spi.engineInitSign((PrivateKey)key);
break;
case I_PRIV_SR:
spi.engineInitSign((PrivateKey)key, random);
break;
case I_PRIV_PARAM_SR:
spi.engineInitSign((PrivateKey)key, params, random);
break;
case S_PARAM:
spi.engineSetParameter(params);
break;
default:
throw new AssertionError("Internal error: " + type);
case I_PUB -> spi.engineInitVerify((PublicKey) key);
case I_PUB_PARAM -> spi.engineInitVerify((PublicKey) key, params);
case I_PRIV -> spi.engineInitSign((PrivateKey) key);
case I_PRIV_SR -> spi.engineInitSign((PrivateKey) key, random);
case I_PRIV_PARAM_SR -> spi.engineInitSign((PrivateKey) key, params, random);
case S_PARAM -> spi.engineSetParameter(params);
default -> throw new AssertionError("Internal error: " + type);
}
}