Skip to content

Commit 0c68719

Browse files
shipilevshipilev
authored
7903355: JMH: Drop support for JDK 7
1 parent 0cffac9 commit 0c68719

File tree

59 files changed

+127
-216
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+127
-216
lines changed

‎.github/workflows/pre-integration.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
runs-on: ${{ matrix.os }}
1717
strategy:
1818
matrix:
19-
java: [7, 8, 11, 17, 19-ea]
19+
java: [8, 11, 17, 19-ea]
2020
os: [ubuntu-20.04, windows-2022, macos-11]
2121
profile: [default, reflection, asm]
2222
fail-fast: false

‎jmh-core-benchmarks/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@ questions.
6666
<plugin>
6767
<groupId>org.apache.maven.plugins</groupId>
6868
<artifactId>maven-compiler-plugin</artifactId>
69-
<configuration>
70-
<compilerVersion>1.7</compilerVersion>
71-
<source>1.7</source>
72-
<target>1.7</target>
73-
</configuration>
7469
</plugin>
7570
<plugin>
7671
<groupId>org.apache.maven.plugins</groupId>

‎jmh-core-benchmarks/src/main/java/org/openjdk/jmh/benchmarks/BlackholePipelinePayloadBench.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void prepare() {
7171
longs[c] = c;
7272
doubles[c] = c;
7373
objects[c] = (double) c;
74-
arrays[c] = new Double[]{Double.valueOf(c)};
74+
arrays[c] = new Double[]{(double) c};
7575
}
7676
}
7777

‎jmh-core-ct/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ questions.
102102
<groupId>org.apache.maven.plugins</groupId>
103103
<artifactId>maven-compiler-plugin</artifactId>
104104
<configuration>
105-
<compilerVersion>1.7</compilerVersion>
106-
<source>1.7</source>
107-
<target>1.7</target>
108105
<compilerArgument>-proc:none</compilerArgument>
109106
</configuration>
110107
</plugin>

‎jmh-core-it/pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,6 @@ questions.
120120
<plugin>
121121
<groupId>org.apache.maven.plugins</groupId>
122122
<artifactId>maven-compiler-plugin</artifactId>
123-
<configuration>
124-
<compilerVersion>1.7</compilerVersion>
125-
<source>1.7</source>
126-
<target>1.7</target>
127-
</configuration>
128123
</plugin>
129124
</plugins>
130125
</build>
@@ -148,9 +143,6 @@ questions.
148143
<groupId>org.apache.maven.plugins</groupId>
149144
<artifactId>maven-compiler-plugin</artifactId>
150145
<configuration>
151-
<compilerVersion>1.7</compilerVersion>
152-
<source>1.7</source>
153-
<target>1.7</target>
154146
<compilerArgument>-proc:none</compilerArgument>
155147
</configuration>
156148
<executions>
@@ -235,9 +227,6 @@ questions.
235227
<groupId>org.apache.maven.plugins</groupId>
236228
<artifactId>maven-compiler-plugin</artifactId>
237229
<configuration>
238-
<compilerVersion>1.7</compilerVersion>
239-
<source>1.7</source>
240-
<target>1.7</target>
241230
<compilerArgument>-proc:none</compilerArgument>
242231
</configuration>
243232
<executions>

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/asymm/ExactThreadCountTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@
5757
@Fork(1)
5858
public class ExactThreadCountTest {
5959

60-
private final Set<Thread> test1threads = Collections.synchronizedSet(new HashSet<Thread>());
61-
private final Set<Thread> test2threads = Collections.synchronizedSet(new HashSet<Thread>());
60+
private final Set<Thread> test1threads = Collections.synchronizedSet(new HashSet<>());
61+
private final Set<Thread> test2threads = Collections.synchronizedSet(new HashSet<>());
6262

6363
@Setup(Level.Iteration)
6464
public void setup() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/asymm/Zero1ThreadCountTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
@Fork(1)
5656
public class Zero1ThreadCountTest {
5757

58-
private final Set<Thread> test1threads = Collections.synchronizedSet(new HashSet<Thread>());
59-
private final Set<Thread> test2threads = Collections.synchronizedSet(new HashSet<Thread>());
58+
private final Set<Thread> test1threads = Collections.synchronizedSet(new HashSet<>());
59+
private final Set<Thread> test2threads = Collections.synchronizedSet(new HashSet<>());
6060

6161
@TearDown
6262
public void check() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/asymm/Zero2ThreadCountTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
@Fork(1)
5656
public class Zero2ThreadCountTest {
5757

58-
private final Set<Thread> test1threads = Collections.synchronizedSet(new HashSet<Thread>());
59-
private final Set<Thread> test2threads = Collections.synchronizedSet(new HashSet<Thread>());
58+
private final Set<Thread> test1threads = Collections.synchronizedSet(new HashSet<>());
59+
private final Set<Thread> test2threads = Collections.synchronizedSet(new HashSet<>());
6060

6161
@TearDown
6262
public void check() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/errors/ForkedStuckShutdownHookTest.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,13 @@ public class ForkedStuckShutdownHookTest {
4444
@Setup
4545
public void setup() {
4646
Runtime.getRuntime().addShutdownHook(
47-
new Thread() {
48-
@Override
49-
public void run() {
50-
try {
51-
TimeUnit.DAYS.sleep(1);
52-
} catch (InterruptedException e) {
53-
e.printStackTrace();
54-
}
47+
new Thread(() -> {
48+
try {
49+
TimeUnit.DAYS.sleep(1);
50+
} catch (InterruptedException e) {
51+
e.printStackTrace();
5552
}
56-
}
53+
})
5754
);
5855
}
5956

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/errors/ForkedStuckThreadTest.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,14 +43,11 @@ public class ForkedStuckThreadTest {
4343

4444
@Setup
4545
public void setup() {
46-
Thread t = new Thread(new Runnable() {
47-
@Override
48-
public void run() {
49-
try {
50-
TimeUnit.DAYS.sleep(1);
51-
} catch (InterruptedException e) {
52-
e.printStackTrace();
53-
}
46+
Thread t = new Thread(() -> {
47+
try {
48+
TimeUnit.DAYS.sleep(1);
49+
} catch (InterruptedException e) {
50+
e.printStackTrace();
5451
}
5552
});
5653
t.setDaemon(false);

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/infraparams/BenchmarkParamsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class BenchmarkParamsTest {
4747

4848
@Setup(Level.Iteration)
4949
public void setup() {
50-
set = Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<BenchmarkParams, Boolean>()));
50+
set = Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<>()));
5151
}
5252

5353
@TearDown(Level.Iteration)

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/infraparams/IterationParamsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class IterationParamsTest {
4747

4848
@Setup(Level.Iteration)
4949
public void setup() {
50-
set = Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<IterationParams, Boolean>()));
50+
set = Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<>()));
5151
}
5252

5353
@TearDown(Level.Iteration)

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/infraparams/ThreadParamsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class ThreadParamsTest {
4444

4545
@Setup(Level.Iteration)
4646
public void setup() {
47-
set = Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<ThreadParams, Boolean>()));
47+
set = Collections.synchronizedSet(Collections.newSetFromMap(new IdentityHashMap<>()));
4848
}
4949

5050
@TearDown(Level.Iteration)

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkBenchSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
@State(Scope.Benchmark)
5252
public class BenchmarkBenchSharingTest {
5353

54-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
54+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5555

5656
@TearDown(Level.Trial)
5757
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/BenchmarkStateSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class BenchmarkStateSharingTest {
5252

5353
@State(Scope.Benchmark)
5454
public static class MyState {
55-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
55+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5656

5757
@TearDown(Level.Trial)
5858
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupBenchSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@State(Scope.Group)
5353
public class GroupBenchSharingTest {
5454

55-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
55+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5656

5757
@TearDown(Level.Trial)
5858
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultBenchSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@State(Scope.Group)
5353
public class GroupDefaultBenchSharingTest {
5454

55-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
55+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5656

5757
@TearDown(Level.Trial)
5858
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupDefaultStateSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class GroupDefaultStateSharingTest {
5353

5454
@State(Scope.Group)
5555
public static class MyState {
56-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
56+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5757

5858
@TearDown(Level.Trial)
5959
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/GroupStateSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public class GroupStateSharingTest {
5353

5454
@State(Scope.Group)
5555
public static class MyState {
56-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
56+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5757

5858
@TearDown(Level.Trial)
5959
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadBenchSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
@State(Scope.Thread)
5252
public class ThreadBenchSharingTest {
5353

54-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
54+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5555

5656
@TearDown(Level.Trial)
5757
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/sharing/ThreadStateSharingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public class ThreadStateSharingTest {
5252

5353
@State(Scope.Thread)
5454
public static class MyState {
55-
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<Thread>());
55+
final Set<Thread> visitors = Collections.synchronizedSet(new HashSet<>());
5656

5757
@TearDown(Level.Trial)
5858
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkBenchSameThreadTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@
5555
@State(Scope.Benchmark)
5656
public class BenchmarkBenchSameThreadTest {
5757

58-
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<Thread>());
59-
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
60-
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
61-
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<Thread>());
62-
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
63-
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
64-
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
58+
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<>());
59+
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<>());
60+
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<>());
61+
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<>());
62+
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<>());
63+
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<>());
64+
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<>());
6565

6666
@Setup(Level.Trial)
6767
public void setupRun() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/BenchmarkStateSameThreadTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ public class BenchmarkStateSameThreadTest {
5757
@State(Scope.Benchmark)
5858
public static class MyState {
5959

60-
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<Thread>());
61-
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
62-
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
63-
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<Thread>());
64-
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
65-
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
66-
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
60+
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<>());
61+
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<>());
62+
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<>());
63+
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<>());
64+
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<>());
65+
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<>());
66+
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<>());
6767

6868
@Setup(Level.Trial)
6969
public void setupRun() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupBenchSameThreadTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@
5656
@State(Scope.Group)
5757
public class GroupBenchSameThreadTest {
5858

59-
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<Thread>());
60-
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
61-
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
62-
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<Thread>());
63-
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
64-
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
65-
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
59+
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<>());
60+
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<>());
61+
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<>());
62+
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<>());
63+
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<>());
64+
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<>());
65+
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<>());
6666

6767
@Setup(Level.Trial)
6868
public void setupRun() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupStateSameThreadTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ public class GroupStateSameThreadTest {
5858
@State(Scope.Group)
5959
public static class MyState {
6060

61-
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<Thread>());
62-
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
63-
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
64-
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<Thread>());
65-
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<Thread>());
66-
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
67-
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<Thread>());
61+
private final Set<Thread> setupRunThread = Collections.synchronizedSet(new HashSet<>());
62+
private final Set<Thread> setupIterationThread = Collections.synchronizedSet(new HashSet<>());
63+
private final Set<Thread> setupInvocationThread = Collections.synchronizedSet(new HashSet<>());
64+
private final Set<Thread> teardownRunThread = Collections.synchronizedSet(new HashSet<>());
65+
private final Set<Thread> teardownIterationThread = Collections.synchronizedSet(new HashSet<>());
66+
private final Set<Thread> teardownInvocationThread = Collections.synchronizedSet(new HashSet<>());
67+
private final Set<Thread> testInvocationThread = Collections.synchronizedSet(new HashSet<>());
6868

6969
@Setup(Level.Trial)
7070
public void setupRun() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/GroupThreadGroupOrderTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@
4848
@State(Scope.Group)
4949
public class GroupThreadGroupOrderTest {
5050

51-
private final Set<Thread> abc = Collections.synchronizedSet(new HashSet<Thread>());
52-
private final Set<Thread> def = Collections.synchronizedSet(new HashSet<Thread>());
53-
private final Set<Thread> ghi = Collections.synchronizedSet(new HashSet<Thread>());
51+
private final Set<Thread> abc = Collections.synchronizedSet(new HashSet<>());
52+
private final Set<Thread> def = Collections.synchronizedSet(new HashSet<>());
53+
private final Set<Thread> ghi = Collections.synchronizedSet(new HashSet<>());
5454

5555
@Setup(Level.Iteration)
5656
public void prepare() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/MaxThreadCountTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@State(Scope.Benchmark)
5353
public class MaxThreadCountTest {
5454

55-
private final Set<Thread> threads = Collections.synchronizedSet(new HashSet<Thread>());
55+
private final Set<Thread> threads = Collections.synchronizedSet(new HashSet<>());
5656

5757
@TearDown(Level.Iteration)
5858
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/OneThreadCountTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@State(Scope.Benchmark)
5353
public class OneThreadCountTest {
5454

55-
private final Set<Thread> threads = Collections.synchronizedSet(new HashSet<Thread>());
55+
private final Set<Thread> threads = Collections.synchronizedSet(new HashSet<>());
5656

5757
@TearDown(Level.Iteration)
5858
public void tearDown() {

‎jmh-core-it/src/test/java/org/openjdk/jmh/it/threads/TwoThreadCountTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
@State(Scope.Benchmark)
5353
public class TwoThreadCountTest {
5454

55-
private final Set<Thread> threads = Collections.synchronizedSet(new HashSet<Thread>());
55+
private final Set<Thread> threads = Collections.synchronizedSet(new HashSet<>());
5656

5757
@TearDown(Level.Iteration)
5858
public void tearDown() {

‎jmh-core/pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ questions.
7878
<groupId>org.apache.maven.plugins</groupId>
7979
<artifactId>maven-compiler-plugin</artifactId>
8080
<configuration>
81-
<compilerVersion>1.7</compilerVersion>
82-
<source>1.7</source>
83-
<target>1.7</target>
8481
<fork>true</fork>
8582
<compilerArgs>
8683
<arg>-proc:none</arg>

‎jmh-core/src/main/java/org/openjdk/jmh/generators/core/CompilerControlPlugin.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ class CompilerControlPlugin {
4141

4242
private final SortedSet<String> lines = new TreeSet<>();
4343

44-
private final Set<MethodInfo> defaultForceInlineMethods = new TreeSet<>(new Comparator<MethodInfo>() {
45-
@Override
46-
public int compare(MethodInfo o1, MethodInfo o2) {
47-
return o1.getQualifiedName().compareTo(o2.getQualifiedName());
48-
}
49-
});
44+
private final Set<MethodInfo> defaultForceInlineMethods = new TreeSet<>(Comparator.comparing(MethodInfo::getQualifiedName));
5045

5146
private final Set<String> alwaysDontInlineMethods = new TreeSet<>();
5247

0 commit comments

Comments
 (0)