From ef0dc2518e7636cc8a9ca580613ff5edeb4c19fd Mon Sep 17 00:00:00 2001 From: Viktor Klang Date: Mon, 11 Nov 2024 19:57:26 +0000 Subject: [PATCH] 8342707: Prepare Gatherers for graduation from Preview Reviewed-by: alanb, liach --- .../share/classes/java/util/stream/Gatherer.java | 13 ++++--------- .../share/classes/java/util/stream/GathererOp.java | 2 +- .../share/classes/java/util/stream/Gatherers.java | 6 ++---- .../share/classes/java/util/stream/Stream.java | 7 ++----- .../classes/jdk/internal/javac/PreviewFeature.java | 1 - test/jdk/java/util/stream/GathererAPITest.java | 1 - .../java/util/stream/GathererShortCircuitTest.java | 1 - test/jdk/java/util/stream/GathererTest.java | 1 - test/jdk/java/util/stream/GatherersFoldTest.java | 1 - .../util/stream/GatherersMapConcurrentTest.java | 1 - test/jdk/java/util/stream/GatherersScanTest.java | 1 - .../java/util/stream/GatherersWindowFixedTest.java | 1 - .../util/stream/GatherersWindowSlidingTest.java | 1 - .../java/util/stream/ops/ref/GatherFMRPar.java | 4 ++-- .../java/util/stream/ops/ref/GatherFMRSeq.java | 4 ++-- .../stream/ops/ref/GatherFlatMapInfinitySeq.java | 4 ++-- .../java/util/stream/ops/ref/GatherFlatMapSeq.java | 4 ++-- .../java/util/stream/ops/ref/GatherMapPar.java | 4 ++-- .../java/util/stream/ops/ref/GatherMapSeq.java | 4 ++-- .../java/util/stream/ops/ref/GatherMiscPar.java | 4 ++-- .../java/util/stream/ops/ref/GatherMiscSeq.java | 4 ++-- .../java/util/stream/ops/ref/GatherReducePar.java | 4 ++-- .../java/util/stream/ops/ref/GatherReduceSeq.java | 4 ++-- .../util/stream/ops/ref/GatherWhileOrdered.java | 4 ++-- 24 files changed, 31 insertions(+), 50 deletions(-) diff --git a/src/java.base/share/classes/java/util/stream/Gatherer.java b/src/java.base/share/classes/java/util/stream/Gatherer.java index 40c3c682e73..267ec62b931 100644 --- a/src/java.base/share/classes/java/util/stream/Gatherer.java +++ b/src/java.base/share/classes/java/util/stream/Gatherer.java @@ -24,7 +24,6 @@ */ package java.util.stream; -import jdk.internal.javac.PreviewFeature; import jdk.internal.vm.annotation.ForceInline; import java.util.*; @@ -195,9 +194,8 @@ import java.util.function.Supplier; * @param the potentially mutable state type of the gatherer operation * (often hidden as an implementation detail) * @param the type of output elements from the gatherer operation - * @since 22 + * @since 24 */ -@PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS) public interface Gatherer { /** * A function that produces an instance of the intermediate state used for @@ -481,10 +479,9 @@ public interface Gatherer { * A Downstream object is the next stage in a pipeline of operations, * to which elements can be sent. * @param the type of elements this downstream accepts - * @since 22 + * @since 24 */ @FunctionalInterface - @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS) interface Downstream { /** @@ -524,10 +521,9 @@ public interface Gatherer { * @param the type of state used by this integrator * @param the type of elements this integrator consumes * @param the type of results this integrator can produce - * @since 22 + * @since 24 */ @FunctionalInterface - @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS) interface Integrator { /** * Performs an action given: the current state, the next element, and @@ -584,10 +580,9 @@ public interface Gatherer { * @param the type of state used by this integrator * @param the type of elements this greedy integrator receives * @param the type of results this greedy integrator can produce - * @since 22 + * @since 24 */ @FunctionalInterface - @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS) interface Greedy extends Integrator { } } } diff --git a/src/java.base/share/classes/java/util/stream/GathererOp.java b/src/java.base/share/classes/java/util/stream/GathererOp.java index 37f01901201..39758bd834a 100644 --- a/src/java.base/share/classes/java/util/stream/GathererOp.java +++ b/src/java.base/share/classes/java/util/stream/GathererOp.java @@ -45,7 +45,7 @@ import java.util.stream.Gatherer.Integrator; * The performance-critical code below contains some more complicated encodings: * therefore, make sure to run benchmarks to verify changes to prevent regressions. * - * @since 22 + * @since 24 */ final class GathererOp extends ReferencePipeline { @SuppressWarnings("unchecked") diff --git a/src/java.base/share/classes/java/util/stream/Gatherers.java b/src/java.base/share/classes/java/util/stream/Gatherers.java index c201ee54609..b394f6fc7d8 100644 --- a/src/java.base/share/classes/java/util/stream/Gatherers.java +++ b/src/java.base/share/classes/java/util/stream/Gatherers.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -25,7 +25,6 @@ package java.util.stream; import jdk.internal.access.SharedSecrets; -import jdk.internal.javac.PreviewFeature; import jdk.internal.vm.annotation.ForceInline; import java.util.ArrayDeque; @@ -48,9 +47,8 @@ import java.util.stream.Gatherer.Downstream; * operations, such as windowing functions, folding functions, * transforming elements concurrently, etc. * - * @since 22 + * @since 24 */ -@PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS) public final class Gatherers { private Gatherers() { } // This class is not intended to be instantiated diff --git a/src/java.base/share/classes/java/util/stream/Stream.java b/src/java.base/share/classes/java/util/stream/Stream.java index 30b87bd8b54..1dd13133fe1 100644 --- a/src/java.base/share/classes/java/util/stream/Stream.java +++ b/src/java.base/share/classes/java/util/stream/Stream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2024, 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 @@ -24,8 +24,6 @@ */ package java.util.stream; -import jdk.internal.javac.PreviewFeature; - import java.nio.file.Files; import java.nio.file.Path; import java.util.*; @@ -1096,9 +1094,8 @@ public interface Stream extends BaseStream> { * @param The element type of the new stream * @param gatherer a gatherer * @return the new stream - * @since 22 + * @since 24 */ - @PreviewFeature(feature = PreviewFeature.Feature.STREAM_GATHERERS) default Stream gather(Gatherer gatherer) { return StreamSupport.stream(spliterator(), isParallel()) .gather(gatherer) diff --git a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java index 483093e66eb..4b2a0629706 100644 --- a/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java +++ b/src/java.base/share/classes/jdk/internal/javac/PreviewFeature.java @@ -76,7 +76,6 @@ public @interface PreviewFeature { STRUCTURED_CONCURRENCY, @JEP(number=466, title="ClassFile API", status="Second Preview") CLASSFILE_API, - @JEP(number=473, title="Stream Gatherers", status="Second Preview") STREAM_GATHERERS, @JEP(number=476, title="Module Import Declarations", status="Preview") MODULE_IMPORTS, diff --git a/test/jdk/java/util/stream/GathererAPITest.java b/test/jdk/java/util/stream/GathererAPITest.java index 4bcda85ccbc..364d3065acb 100644 --- a/test/jdk/java/util/stream/GathererAPITest.java +++ b/test/jdk/java/util/stream/GathererAPITest.java @@ -35,7 +35,6 @@ import static org.junit.jupiter.api.Assumptions.*; /** * @test * @summary Testing public API of Gatherer - * @enablePreview * @run junit GathererAPITest */ diff --git a/test/jdk/java/util/stream/GathererShortCircuitTest.java b/test/jdk/java/util/stream/GathererShortCircuitTest.java index 059d90a6e7f..7e755dbe23c 100644 --- a/test/jdk/java/util/stream/GathererShortCircuitTest.java +++ b/test/jdk/java/util/stream/GathererShortCircuitTest.java @@ -32,7 +32,6 @@ import static org.junit.jupiter.api.Assumptions.*; * @test * @bug 8328316 * @summary Testing Gatherer behavior under short circuiting - * @enablePreview * @run junit GathererShortCircuitTest */ diff --git a/test/jdk/java/util/stream/GathererTest.java b/test/jdk/java/util/stream/GathererTest.java index 3d8e608cc6c..7a03c0b35ed 100644 --- a/test/jdk/java/util/stream/GathererTest.java +++ b/test/jdk/java/util/stream/GathererTest.java @@ -37,7 +37,6 @@ import static org.junit.jupiter.api.Assumptions.*; /** * @test * @summary Testing the Gatherer contract - * @enablePreview * @library /lib/testlibrary/bootlib * @build java.base/java.util.stream.DefaultMethodStreams * @run junit GathererTest diff --git a/test/jdk/java/util/stream/GatherersFoldTest.java b/test/jdk/java/util/stream/GatherersFoldTest.java index caecff19e3a..0e0535882f9 100644 --- a/test/jdk/java/util/stream/GatherersFoldTest.java +++ b/test/jdk/java/util/stream/GatherersFoldTest.java @@ -34,7 +34,6 @@ import static org.junit.jupiter.api.Assumptions.*; /** * @test * @summary Tests the API and contract of Gatherers.fold - * @enablePreview * @run junit GatherersFoldTest */ diff --git a/test/jdk/java/util/stream/GatherersMapConcurrentTest.java b/test/jdk/java/util/stream/GatherersMapConcurrentTest.java index 5ff845f55b9..f7cc1c42a3c 100644 --- a/test/jdk/java/util/stream/GatherersMapConcurrentTest.java +++ b/test/jdk/java/util/stream/GatherersMapConcurrentTest.java @@ -38,7 +38,6 @@ import static org.junit.jupiter.api.Assumptions.*; /** * @test * @summary Tests the API and contract of Gatherers.mapConcurrent - * @enablePreview * @run junit GatherersMapConcurrentTest */ diff --git a/test/jdk/java/util/stream/GatherersScanTest.java b/test/jdk/java/util/stream/GatherersScanTest.java index 993a616233c..51b7c0ef0eb 100644 --- a/test/jdk/java/util/stream/GatherersScanTest.java +++ b/test/jdk/java/util/stream/GatherersScanTest.java @@ -35,7 +35,6 @@ import static org.junit.jupiter.api.Assumptions.*; /** * @test * @summary Tests the API and contract of Gatherers.scan - * @enablePreview * @run junit GatherersScanTest */ diff --git a/test/jdk/java/util/stream/GatherersWindowFixedTest.java b/test/jdk/java/util/stream/GatherersWindowFixedTest.java index 69426dfd768..cddfee1b098 100644 --- a/test/jdk/java/util/stream/GatherersWindowFixedTest.java +++ b/test/jdk/java/util/stream/GatherersWindowFixedTest.java @@ -36,7 +36,6 @@ import static org.junit.jupiter.api.Assumptions.*; /** * @test * @summary Tests the API and contract of Gatherers.windowFixed - * @enablePreview * @run junit GatherersWindowFixedTest */ diff --git a/test/jdk/java/util/stream/GatherersWindowSlidingTest.java b/test/jdk/java/util/stream/GatherersWindowSlidingTest.java index 27ed6ecc4dd..29ffa54e882 100644 --- a/test/jdk/java/util/stream/GatherersWindowSlidingTest.java +++ b/test/jdk/java/util/stream/GatherersWindowSlidingTest.java @@ -36,7 +36,6 @@ import static org.junit.jupiter.api.Assumptions.*; /** * @test * @summary Tests the API and contract of Gatherers.windowSliding - * @enablePreview * @run junit GatherersWindowSlidingTest */ diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java index cd83ab86034..91e09c2a077 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRPar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherFMRPar { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java index a1973a45831..639d4290089 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFMRSeq.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherFMRSeq { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java index 2b804551dbf..119f3917da3 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapInfinitySeq.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherFlatMapInfinitySeq { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java index 31c1f047c12..cb5e1443f1d 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherFlatMapSeq.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherFlatMapSeq { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java index b7c60af6cdd..de0be6d86f1 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapPar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherMapPar { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java index 1dbbbd05009..1c6f7acdfa5 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMapSeq.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -48,7 +48,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherMapSeq { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java index 12f5c98702b..0f8e1ef2fad 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscPar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherMiscPar { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java index a60d02af7b6..c6382111287 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherMiscSeq.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -51,7 +51,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherMiscSeq { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java index 6742ee98590..097ffa283b5 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReducePar.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherReducePar { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java index 7356fdb979b..b460143d32b 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherReduceSeq.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -51,7 +51,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherReduceSeq { diff --git a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java index f0b3fef4438..f93ca5454c7 100644 --- a/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java +++ b/test/micro/org/openjdk/bench/java/util/stream/ops/ref/GatherWhileOrdered.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2023, 2024, 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 @@ -49,7 +49,7 @@ import static org.openjdk.bench.java.util.stream.ops.ref.BenchmarkGathererImpls. @BenchmarkMode(Mode.Throughput) @Warmup(iterations = 4, time = 5, timeUnit = TimeUnit.SECONDS) @Measurement(iterations = 7, time = 5, timeUnit = TimeUnit.SECONDS) -@Fork(jvmArgs = "--enable-preview", value = 1) +@Fork(value = 1) @OutputTimeUnit(TimeUnit.SECONDS) @State(Scope.Thread) public class GatherWhileOrdered {