Skip to content

Commit 4df00c7

Browse files
author
Vincent Potucek
committed
rewirte
1 parent eaf5ae9 commit 4df00c7

File tree

49 files changed

+212
-105
lines changed

Some content is hidden

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

49 files changed

+212
-105
lines changed

‎documentation/src/test/java/example/ClassTemplateDemo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ void wellKnown() {
5252
}
5353

5454
// end::user_guide[]
55-
static
55+
public
5656
// tag::user_guide[]
57-
public class MyClassTemplateInvocationContextProvider
57+
static class MyClassTemplateInvocationContextProvider
5858
// tag::custom_line_break[]
5959
implements ClassTemplateInvocationContextProvider {
6060

‎documentation/src/test/java/example/ParameterizedMigrationDemo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ public class ParameterizedMigrationDemo {
2525
// tag::before[]
2626
@RunWith(Parameterized.class)
2727
// end::before[]
28-
static
28+
public
2929
// tag::before[]
30-
public class JUnit4ParameterizedClassTests {
30+
static class JUnit4ParameterizedClassTests {
3131

3232
@Parameterized.Parameters
3333
public static Iterable<Object[]> data() {

‎documentation/src/test/java/example/ParameterizedTestDemo.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -357,9 +357,9 @@ void testWithArgumentsSource(String argument) {
357357
}
358358

359359
// end::ArgumentsSource_example[]
360-
static
360+
public
361361
// tag::ArgumentsProvider_example[]
362-
public class MyArgumentsProvider implements ArgumentsProvider {
362+
static class MyArgumentsProvider implements ArgumentsProvider {
363363

364364
@Override
365365
public Stream<? extends Arguments> provideArguments(ParameterDeclarations parameters,
@@ -375,9 +375,9 @@ void testWithArgumentsSourceWithConstructorInjection(String argument) {
375375
assertNotNull(argument);
376376
}
377377

378-
static
378+
public
379379
// tag::ArgumentsProviderWithConstructorInjection_example[]
380-
public class MyArgumentsProviderWithConstructorInjection implements ArgumentsProvider {
380+
static class MyArgumentsProviderWithConstructorInjection implements ArgumentsProvider {
381381

382382
private final TestInfo testInfo;
383383

@@ -427,9 +427,9 @@ void testWithImplicitFallbackArgumentConversion(Book book) {
427427
}
428428

429429
// end::implicit_fallback_conversion_example[]
430-
static
430+
public
431431
// tag::implicit_fallback_conversion_example_Book[]
432-
public class Book {
432+
static class Book {
433433

434434
private final String title;
435435

@@ -458,10 +458,10 @@ void testWithExplicitArgumentConversion(
458458
}
459459

460460
// end::explicit_conversion_example[]
461-
static
461+
public
462462
@SuppressWarnings({ "NullableProblems", "NullAway" })
463463
// tag::explicit_conversion_example_ToStringArgumentConverter[]
464-
public class ToStringArgumentConverter extends SimpleArgumentConverter {
464+
static class ToStringArgumentConverter extends SimpleArgumentConverter {
465465

466466
@Override
467467
protected Object convert(Object source, Class<?> targetType) {
@@ -474,10 +474,10 @@ protected Object convert(Object source, Class<?> targetType) {
474474
}
475475
// end::explicit_conversion_example_ToStringArgumentConverter[]
476476

477-
static
477+
public
478478
@SuppressWarnings({ "NullableProblems", "NullAway", "ConstantValue" })
479479
// tag::explicit_conversion_example_TypedArgumentConverter[]
480-
public class ToLengthArgumentConverter extends TypedArgumentConverter<String, Integer> {
480+
static class ToLengthArgumentConverter extends TypedArgumentConverter<String, Integer> {
481481

482482
protected ToLengthArgumentConverter() {
483483
super(String.class, Integer.class);
@@ -516,7 +516,7 @@ void testWithArgumentsAccessor(ArgumentsAccessor arguments) {
516516
arguments.get(2, Gender.class),
517517
arguments.get(3, LocalDate.class));
518518

519-
if (person.getFirstName().equals("Jane")) {
519+
if ("Jane".equals(person.getFirstName())) {
520520
assertEquals(Gender.F, person.getGender());
521521
}
522522
else {
@@ -540,9 +540,9 @@ void testWithArgumentsAggregator(@AggregateWith(PersonAggregator.class) Person p
540540
}
541541

542542
// end::ArgumentsAggregator_example[]
543-
static
543+
public
544544
// tag::ArgumentsAggregator_example_PersonAggregator[]
545-
public class PersonAggregator extends SimpleArgumentsAggregator {
545+
static class PersonAggregator extends SimpleArgumentsAggregator {
546546
@Override
547547
protected Person aggregateArguments(ArgumentsAccessor arguments, Class<?> targetType,
548548
AnnotatedElementContext context, int parameterIndex) {

‎documentation/src/test/java/example/TestInfoDemo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ static void beforeAll(TestInfo testInfo) {
3131

3232
TestInfoDemo(TestInfo testInfo) {
3333
String displayName = testInfo.getDisplayName();
34-
assertTrue(displayName.equals("TEST 1") || displayName.equals("test2()"));
34+
assertTrue("TEST 1".equals(displayName) || "test2()".equals(displayName));
3535
}
3636

3737
@BeforeEach
3838
void init(TestInfo testInfo) {
3939
String displayName = testInfo.getDisplayName();
40-
assertTrue(displayName.equals("TEST 1") || displayName.equals("test2()"));
40+
assertTrue("TEST 1".equals(displayName) || "test2()".equals(displayName));
4141
}
4242

4343
@Test

‎documentation/src/test/java/example/TestTemplateDemo.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@ void testTemplate(String fruit) {
3838
}
3939

4040
// end::user_guide[]
41-
static
41+
public
4242
// @formatter:off
4343
// tag::user_guide[]
44-
public class MyTestTemplateInvocationContextProvider
44+
static class MyTestTemplateInvocationContextProvider
4545
implements TestTemplateInvocationContextProvider {
4646

4747
@Override

‎documentation/src/test/resources/log4j2-test.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@
1616
<AppenderRef ref="Console" />
1717
</Root>
1818
</Loggers>
19-
</Configuration>
19+
</Configuration>

‎gradle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ version = 6.0.0-SNAPSHOT
33
# We need more metaspace due to apparent memory leak in Asciidoctor/JRuby
44
org.gradle.jvmargs=-Xmx1g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError
55
org.gradle.caching=true
6+
# https://github.com/openrewrite/rewrite-gradle-plugin/issues/212
67
org.gradle.parallel=true
78
org.gradle.configuration-cache.parallel=true
89
org.gradle.java.installations.fromEnv=GRAALVM_HOME,JDK17,JDK21,JDK24,JDK25

‎gradle/config/rewrite.yml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
#type: specs.openrewrite.org/v1beta/recipe
2+
#name: org.junit.openrewrite.recipe.CodeCleanup
3+
#displayName: Code cleanup
4+
#description: Automatically cleanup code, e.g. remove unnecessary parentheses, simplify expressions.
5+
#recipeList:
6+
# - org.openrewrite.java.RemoveUnusedImports
7+
# - org.openrewrite.staticanalysis.EqualsAvoidsNull
8+
# - org.openrewrite.staticanalysis.ModifierOrder
9+
# - org.junit.openrewrite.recipe.AddLicenseHeader
10+
# - org.junit.openrewrite.recipe.Java21ForTests
11+
# - org.openrewrite.java.format.AutoFormat
12+
# - org.openrewrite.java.format.BlankLines
13+
# - org.openrewrite.java.format.NormalizeFormat
14+
# - org.openrewrite.java.format.NormalizeLineBreaks
15+
# - org.openrewrite.java.format.RemoveTrailingWhitespace
16+
# - org.openrewrite.java.format.Spaces
17+
# - org.openrewrite.java.format.TabsAndIndents
18+
# - org.openrewrite.java.format.WrappingAndBraces
19+
# - org.openrewrite.java.migrate.UpgradeToJava17
20+
# - org.openrewrite.java.testing.assertj.Assertj
21+
# - org.openrewrite.java.testing.cleanup.AssertTrueNullToAssertNull
22+
# - org.openrewrite.java.testing.cleanup.TestsShouldNotBePublic
23+
# - org.openrewrite.java.testing.junit5.JUnit5BestPractices
24+
# - org.openrewrite.staticanalysis.CodeCleanup
25+
# - org.openrewrite.staticanalysis.CommonStaticAnalysis
26+
# - org.openrewrite.staticanalysis.FinalizeLocalVariables
27+
# - org.openrewrite.staticanalysis.MissingOverrideAnnotation
28+
# - org.openrewrite.staticanalysis.RedundantFileCreation
29+
# - org.openrewrite.staticanalysis.RemoveUnusedLocalVariables
30+
# - org.openrewrite.staticanalysis.RemoveUnusedPrivateFields
31+
# - org.openrewrite.staticanalysis.RemoveUnusedPrivateMethods
32+
# - org.openrewrite.staticanalysis.StringLiteralEquality
33+
# - org.openrewrite.text.EndOfLineAtEndOfFile
34+
#---
35+
type: specs.openrewrite.org/v1beta/recipe
36+
name: org.junit.openrewrite.recipe.AddLicenseHeader
37+
displayName: AddLicenseHeader
38+
recipeList:
39+
- org.openrewrite.java.AddLicenseHeader:
40+
licenseText: """
41+
/*
42+
* Copyright 2015-${CURRENT_YEAR} the original author or authors.
43+
*
44+
* All rights reserved. This program and the accompanying materials are
45+
* made available under the terms of the Eclipse Public License v2.0 which
46+
* accompanies this distribution and is available at
47+
*
48+
* https://www.eclipse.org/legal/epl-v20.html
49+
*/
50+
"""
51+
---
52+
type: specs.openrewrite.org/v1beta/recipe
53+
name: org.junit.openrewrite.recipe.Java21ForTests
54+
displayName: Java21ForTests
55+
preconditions:
56+
- org.openrewrite.java.search.IsLikelyTest
57+
recipeList:
58+
- org.openrewrite.java.migrate.UpgradeToJava21
59+
---
60+
type: specs.openrewrite.org/v1beta/style
61+
name: org.junit.openrewrite.recipe.NoTabsNoStarImports
62+
styleConfigs:
63+
- org.openrewrite.java.style.TabsAndIndentsStyle:
64+
useTabCharacter: false
65+
- org.openrewrite.java.style.ImportLayoutStyle:
66+
classCountToUseStarImport: 9999

‎gradle/libs.versions.toml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ mockito-core = { module = "org.mockito:mockito-core" }
6161
mockito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter" }
6262
nohttp-checkstyle = { module = "io.spring.nohttp:nohttp-checkstyle", version = "0.0.11" }
6363
nullaway = { module = "com.uber.nullaway:nullaway", version = "0.12.7" }
64+
openrewrite-recipe-bom = { module = "org.openrewrite.recipe:rewrite-recipe-bom", version = "3.11.1" }
6465
opentest4j = { module = "org.opentest4j:opentest4j", version.ref = "opentest4j" }
6566
openTestReporting-cli = { module = "org.opentest4j.reporting:open-test-reporting-cli", version.ref = "openTestReporting" }
6667
openTestReporting-events = { module = "org.opentest4j.reporting:open-test-reporting-events", version.ref = "openTestReporting" }
@@ -105,6 +106,7 @@ jreleaser = { id = "org.jreleaser", version = "1.19.0" }
105106
# check if workaround in gradle.properties can be removed when updating
106107
kotlin = { id = "org.jetbrains.kotlin.jvm", version = "2.2.0" }
107108
nullaway = { id = "net.ltgt.nullaway", version = "2.2.0" }
109+
openrewrite = { id = "org.openrewrite.rewrite", version = "7.10.0" }
108110
plantuml = { id = "io.freefair.plantuml", version = "8.14" }
109111
shadow = { id = "com.gradleup.shadow", version = "8.3.8" }
110112
spotless = { id = "com.diffplug.spotless", version = "7.1.0" }

‎gradle/plugins/common/build.gradle.kts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ dependencies {
1616
implementation(libs.plugins.foojayResolver.markerCoordinates)
1717
implementation(libs.plugins.jmh.markerCoordinates)
1818
implementation(libs.plugins.nullaway.markerCoordinates)
19+
implementation(libs.plugins.openrewrite.markerCoordinates)
1920
implementation(libs.plugins.shadow.markerCoordinates)
2021
implementation(libs.plugins.spotless.markerCoordinates)
2122
}

0 commit comments

Comments
 (0)