Add fail last error handler if fail fast is not enabled.

raphw · Dec 2, 2021 · 832a333 · 832a333
1 parent c9d4b3c
commit 832a333
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/dynamic/scaffold/InstrumentedTypeDefaultTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/dynamic/scaffold/InstrumentedTypeDefaultTest.java
@@ -213,8 +213,8 @@ public void testWithAuxiliaryField() throws Exception {
         assertThat(instrumentedType.getLoadedTypeInitializer().isAlive(), is(true));
     }
 
-    @SuppressWarnings("unchecked")
     @Test(expected = IllegalStateException.class)
+    @SuppressWarnings("unchecked")
     public void testWithAuxiliaryFieldConflict() throws Exception {
         TypeDescription.Generic fieldType = mock(TypeDescription.Generic.class);
         when(fieldType.accept(Mockito.any(TypeDescription.Generic.Visitor.class))).thenReturn(fieldType);

diff --git a/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java b/byte-buddy-gradle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTask.java
@@ -417,7 +417,7 @@ protected void doApply(Plugin.Engine.Source source, Plugin.Engine.Target target)
                                 ? Plugin.Engine.ErrorHandler.Enforcing.NO_LIVE_INITIALIZERS
                                 : Plugin.Engine.Listener.NoOp.INSTANCE, isFailFast()
                                 ? Plugin.Engine.ErrorHandler.Failing.FAIL_FAST
-                                : Plugin.Engine.Listener.NoOp.INSTANCE)
+                                : Plugin.Engine.ErrorHandler.Failing.FAIL_LAST)
                         .with(getThreads() == 0
                                 ? Plugin.Engine.Dispatcher.ForSerialTransformation.Factory.INSTANCE
                                 : new Plugin.Engine.Dispatcher.ForParallelTransformation.WithThrowawayExecutorService.Factory(getThreads()))

diff --git a/...radle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskExtension.java b/...radle-plugin/src/main/java/net/bytebuddy/build/gradle/AbstractByteBuddyTaskExtension.java
@@ -118,6 +118,7 @@ protected AbstractByteBuddyTaskExtension() {
         suffix = "";
         failOnLiveInitializer = true;
         warnOnEmptyTypeSet = true;
+        failFast = true;
         discovery = Discovery.EMPTY;
         adjustment = Adjustment.FULL;
         adjustmentErrorHandler = Adjustment.ErrorHandler.WARN;

diff --git a/...dy-gradle-plugin/src/test/java/net/bytebuddy/build/gradle/ByteBuddyTaskExtensionTest.java b/...dy-gradle-plugin/src/test/java/net/bytebuddy/build/gradle/ByteBuddyTaskExtensionTest.java
@@ -39,13 +39,12 @@ public void testDefaultProperties() {
         assertThat(extension.getSuffix(), is(""));
         assertThat(extension.getThreads(), is(0));
         assertThat(extension.isExtendedParsing(), is(false));
-        assertThat(extension.isFailFast(), is(false));
+        assertThat(extension.isFailFast(), is(true));
         assertThat(extension.isFailOnLiveInitializer(), is(true));
         assertThat(extension.getAdjustment(), is(Adjustment.FULL));
         assertThat(extension.getAdjustmentErrorHandler(), is(Adjustment.ErrorHandler.WARN));
         assertThat(extension.getAdjustmentPostProcessor(), is((Action<Task>) Adjustment.NoOpPostProcessor.INSTANCE));
         assertThat(extension.isWarnOnEmptyTypeSet(), is(true));
-        assertThat(extension.isFailFast(), is(false));
         assertThat(extension.isLazy(), is(false));
         assertThat(extension.getDiscovery(), is(Discovery.EMPTY));
         assertThat(extension.getClassFileVersion(), nullValue(ClassFileVersion.class));

diff --git a/byte-buddy-maven-plugin/src/main/java/net/bytebuddy/build/maven/ByteBuddyMojo.java b/byte-buddy-maven-plugin/src/main/java/net/bytebuddy/build/maven/ByteBuddyMojo.java
@@ -397,7 +397,7 @@ private Plugin.Engine.Summary apply(File root,
                                     ? Plugin.Engine.ErrorHandler.Enforcing.NO_LIVE_INITIALIZERS
                                     : Plugin.Engine.Listener.NoOp.INSTANCE, failFast
                                     ? Plugin.Engine.ErrorHandler.Failing.FAIL_FAST
-                                    : Plugin.Engine.Listener.NoOp.INSTANCE)
+                                    : Plugin.Engine.ErrorHandler.Failing.FAIL_LAST)
                             .with(threads == 0
                                     ? Plugin.Engine.Dispatcher.ForSerialTransformation.Factory.INSTANCE
                                     : new Plugin.Engine.Dispatcher.ForParallelTransformation.WithThrowawayExecutorService.Factory(threads))