mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-28 23:34:52 +02:00
8258852: Arrays.asList() for single item could be replaced with List.of()
Reviewed-by: mullan
This commit is contained in:
parent
85bac8c415
commit
7ddc2b5606
3 changed files with 11 additions and 17 deletions
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2015, 2021, 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
|
||||
|
@ -29,7 +29,6 @@ import java.io.IOException;
|
|||
import java.nio.ByteBuffer;
|
||||
import java.security.GeneralSecurityException;
|
||||
import java.text.MessageFormat;
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.EnumSet;
|
||||
import java.util.LinkedList;
|
||||
|
@ -236,7 +235,7 @@ final class KeyShareExtension {
|
|||
List<NamedGroup> namedGroups;
|
||||
if (chc.serverSelectedNamedGroup != null) {
|
||||
// Response to HelloRetryRequest
|
||||
namedGroups = Arrays.asList(chc.serverSelectedNamedGroup);
|
||||
namedGroups = List.of(chc.serverSelectedNamedGroup);
|
||||
} else {
|
||||
namedGroups = chc.clientRequestedNamedGroups;
|
||||
if (namedGroups == null || namedGroups.isEmpty()) {
|
||||
|
@ -289,7 +288,6 @@ final class KeyShareExtension {
|
|||
|
||||
private static byte[] getShare(ClientHandshakeContext chc,
|
||||
NamedGroup ng) {
|
||||
byte[] share = null;
|
||||
SSLKeyExchange ke = SSLKeyExchange.valueOf(ng);
|
||||
if (ke == null) {
|
||||
if (SSLLogger.isOn && SSLLogger.isOn("ssl,handshake")) {
|
||||
|
@ -307,7 +305,7 @@ final class KeyShareExtension {
|
|||
}
|
||||
}
|
||||
}
|
||||
return share;
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -836,12 +834,10 @@ final class KeyShareExtension {
|
|||
spec.clientShares.size() == 1) {
|
||||
int namedGroupId = spec.clientShares.get(0).namedGroupId;
|
||||
|
||||
byte[] extdata = new byte[] {
|
||||
return new byte[] {
|
||||
(byte)((namedGroupId >> 8) & 0xFF),
|
||||
(byte)(namedGroupId & 0xFF)
|
||||
};
|
||||
|
||||
return extdata;
|
||||
}
|
||||
|
||||
return null;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue