From eef329046e453482e3d19fd556d56ec398bfd341 Mon Sep 17 00:00:00 2001 From: Marvin Date: Wed, 31 Jul 2024 13:57:25 +0000 Subject: [PATCH] fake (#2479) * fake * Ignore toolchains plugin when running openrewrite Signed-off-by: Marvin Froeder --------- Signed-off-by: Marvin Froeder --- .github/workflows/receive-pr.yml | 2 +- core/src/test/java/feign/UtilTest.java | 13 ++- pom.xml | 154 ++++++++++++++++--------- 3 files changed, 111 insertions(+), 58 deletions(-) diff --git a/.github/workflows/receive-pr.yml b/.github/workflows/receive-pr.yml index eeb201ebd..5a709c329 100644 --- a/.github/workflows/receive-pr.yml +++ b/.github/workflows/receive-pr.yml @@ -42,7 +42,7 @@ jobs: # Execute recipes - name: Apply OpenRewrite recipes - run: mvn --activate-profiles openrewrite org.openrewrite.maven:rewrite-maven-plugin:run + run: ./mvnw -Dtoolchain.skip=true -Dlicense.skip=true -DskipTests=true -P openrewrite clean install # Capture the diff - name: Create patch diff --git a/core/src/test/java/feign/UtilTest.java b/core/src/test/java/feign/UtilTest.java index cfaeee6f6..7573f8d5a 100644 --- a/core/src/test/java/feign/UtilTest.java +++ b/core/src/test/java/feign/UtilTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 The Feign Authors + * Copyright 2012-2024 The Feign Authors * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -20,6 +20,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.assertThatExceptionOfType; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.io.Reader; import java.lang.reflect.Type; import java.util.Arrays; @@ -86,6 +87,16 @@ void resolveLastTypeParameterWhenNotSubtype() throws Exception { assertThat(last).isEqualTo(listStringType); } + + @Test + void fake() throws Exception { + Type context = + LastTypeParameter.class.getDeclaredField("PARAMETERIZED_LIST_STRING").getGenericType(); + Type listStringType = LastTypeParameter.class.getDeclaredField("LIST_STRING").getGenericType(); + Type last = resolveLastTypeParameter(context, Parameterized.class); + assertEquals(last, listStringType); + } + @Test void lastTypeFromInstance() throws Exception { Parameterized instance = new ParameterizedSubtype(); diff --git a/pom.xml b/pom.xml index 8f8dee75e..f4ec318ff 100644 --- a/pom.xml +++ b/pom.xml @@ -479,9 +479,6 @@ true false ${jvm.options} - - ${latest.java.version} - @@ -492,49 +489,12 @@ true false - - ${latest.java.version} - - - org.apache.maven.plugins - maven-toolchains-plugin - 3.2.0 - - - - toolchain - - - - - ${main.java.version} - - - - - - test - generate-test-sources - - toolchain - - - - - ${latest.java.version} - - - - - - - org.moditect moditect-maven-plugin @@ -667,6 +627,9 @@ etc/header.txt **/.idea/** **/target/** + **/scripts/** + **/src/config/** + **/codequality/** LICENSE NOTICE OSSMETADATA @@ -961,43 +924,122 @@ org.openrewrite.maven rewrite-maven-plugin - 5.35.0 - - - - org.openrewrite.java.testing.hamcrest.MigrateHamcrestToAssertJ - org.openrewrite.java.testing.assertj.JUnitToAssertj - org.openrewrite.java.testing.assertj.Assertj - org.openrewrite.java.migrate.UpgradeToJava21 - - - **/src/main/java/** - **/pom.xml - - + 5.36.0 org.openrewrite.recipe rewrite-testing-frameworks - 2.13.0 + 2.14.0 org.openrewrite.recipe rewrite-migrate-java - 2.19.0 + 2.20.0 + tests runNoFork verify + + true + + org.openrewrite.java.testing.hamcrest.MigrateHamcrestToAssertJ + org.openrewrite.java.testing.assertj.JUnitToAssertj + org.openrewrite.java.testing.assertj.Assertj + org.openrewrite.java.migrate.UpgradeToJava21 + + + **/src/main/java/** + pom.xml + + + + + sources + + runNoFork + + verify + + true + + org.openrewrite.java.migrate.UpgradeToJava8 + + + + + + + + + + + toolchain + + + !toolchain.skip + + + + + + + org.apache.maven.plugins + maven-toolchains-plugin + 3.2.0 + + + + toolchain + + + + + ${main.java.version} + + + + + + test + + toolchain + + generate-test-sources + + + + ${latest.java.version} + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + ${latest.java.version} + + + + + org.apache.maven.plugins + maven-failsafe-plugin + + + ${latest.java.version} + + +