From 65a7e93349b26d35af1e50b6ca2184ef72e4a7f5 Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Wed, 7 Oct 2020 22:11:56 -0700 Subject: [PATCH 1/5] 8254090: Collectors.toUnmodifiableList exposes shared secret --- .../classes/java/util/stream/Collectors.java | 10 +++- .../util/stream/CollectorToUnmodListTest.java | 52 +++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java diff --git a/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java index a5a6d2f626d9b..7f1dc7e817b91 100644 --- a/src/java.base/share/classes/java/util/stream/Collectors.java +++ b/src/java.base/share/classes/java/util/stream/Collectors.java @@ -298,8 +298,14 @@ public Set characteristics() { Collector> toUnmodifiableList() { return new CollectorImpl<>((Supplier>) ArrayList::new, List::add, (left, right) -> { left.addAll(right); return left; }, - list -> (List)SharedSecrets.getJavaUtilCollectionAccess() - .listFromTrustedArray(list.toArray()), + list -> { + if (list.getClass() == ArrayList.class) { // ensure it's trusted + return (List)SharedSecrets.getJavaUtilCollectionAccess() + .listFromTrustedArray(list.toArray()); + } else { + throw new IllegalArgumentException(); + } + }, CH_NOID); } diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java new file mode 100644 index 0000000000000..45fae43f8c716 --- /dev/null +++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2012, 2018, 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 + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package org.openjdk.tests.java.util.stream; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collector; +import java.util.stream.Collectors; + +import org.testng.annotations.Test; +import static org.testng.Assert.*; + +/* + * @test + * @bug 8254090 + * @summary Test for Collectors.toUnmodifiableList(). + */ +public class CollectorToUnmodListTest { + @SuppressWarnings("unchecked") + @Test + public void testFinisher() { + String[] array = { "x", "y", "z" }; + List in = new ArrayList<>() { + public Object[] toArray() { + return array; + } + }; + var finisher = (Function, List>)Collectors.toUnmodifiableList().finisher(); + assertThrows(IllegalArgumentException.class, () -> finisher.apply(in)); + } +} From b27a0ba1dc140abd937495a353e2908ce18218fa Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Thu, 8 Oct 2020 13:49:43 -0700 Subject: [PATCH 2/5] update copyright on test --- .../tests/java/util/stream/CollectorToUnmodListTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java index 45fae43f8c716..9106d1b0bccce 100644 --- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java +++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2020, 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 From 4200a25030e2768ff08faa0ac4587e6f2d6501ac Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Thu, 8 Oct 2020 17:42:43 -0700 Subject: [PATCH 3/5] remove unnecessary cast and warnings suppression --- src/java.base/share/classes/java/util/stream/Collectors.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java index 7f1dc7e817b91..5fe01e887463d 100644 --- a/src/java.base/share/classes/java/util/stream/Collectors.java +++ b/src/java.base/share/classes/java/util/stream/Collectors.java @@ -293,15 +293,14 @@ public Set characteristics() { * unmodifiable List in encounter order * @since 10 */ - @SuppressWarnings("unchecked") public static Collector> toUnmodifiableList() { return new CollectorImpl<>((Supplier>) ArrayList::new, List::add, (left, right) -> { left.addAll(right); return left; }, list -> { if (list.getClass() == ArrayList.class) { // ensure it's trusted - return (List)SharedSecrets.getJavaUtilCollectionAccess() - .listFromTrustedArray(list.toArray()); + return SharedSecrets.getJavaUtilCollectionAccess() + .listFromTrustedArray(list.toArray()); } else { throw new IllegalArgumentException(); } From 0ae8f38c9f526d6be9e5e81f0c97cd2ef378a5c8 Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Thu, 8 Oct 2020 18:32:29 -0700 Subject: [PATCH 4/5] remove moar redundant casts --- .../share/classes/java/util/stream/Collectors.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/java.base/share/classes/java/util/stream/Collectors.java b/src/java.base/share/classes/java/util/stream/Collectors.java index 5fe01e887463d..0cf8cdbc7f702 100644 --- a/src/java.base/share/classes/java/util/stream/Collectors.java +++ b/src/java.base/share/classes/java/util/stream/Collectors.java @@ -277,7 +277,7 @@ public Set characteristics() { */ public static Collector> toList() { - return new CollectorImpl<>((Supplier>) ArrayList::new, List::add, + return new CollectorImpl<>(ArrayList::new, List::add, (left, right) -> { left.addAll(right); return left; }, CH_ID); } @@ -295,7 +295,7 @@ public Set characteristics() { */ public static Collector> toUnmodifiableList() { - return new CollectorImpl<>((Supplier>) ArrayList::new, List::add, + return new CollectorImpl<>(ArrayList::new, List::add, (left, right) -> { left.addAll(right); return left; }, list -> { if (list.getClass() == ArrayList.class) { // ensure it's trusted @@ -324,7 +324,7 @@ public Set characteristics() { */ public static Collector> toSet() { - return new CollectorImpl<>((Supplier>) HashSet::new, Set::add, + return new CollectorImpl<>(HashSet::new, Set::add, (left, right) -> { if (left.size() < right.size()) { right.addAll(left); return right; @@ -353,7 +353,7 @@ public Set characteristics() { @SuppressWarnings("unchecked") public static Collector> toUnmodifiableSet() { - return new CollectorImpl<>((Supplier>) HashSet::new, Set::add, + return new CollectorImpl<>(HashSet::new, Set::add, (left, right) -> { if (left.size() < right.size()) { right.addAll(left); return right; From 64079da9af98def54142876a72053b40cf4f46ee Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Thu, 8 Oct 2020 18:33:43 -0700 Subject: [PATCH 5/5] Update test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java Fix copyright years. Co-authored-by: Claes Redestad --- .../tests/java/util/stream/CollectorToUnmodListTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java index 9106d1b0bccce..8eff227dd7c1d 100644 --- a/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java +++ b/test/jdk/java/util/stream/test/org/openjdk/tests/java/util/stream/CollectorToUnmodListTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2020, 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