diff --git a/java/dagger/internal/codegen/base/SourceFileGenerator.java b/java/dagger/internal/codegen/base/SourceFileGenerator.java index dfe14b1d5e2..d42dac4a9d2 100644 --- a/java/dagger/internal/codegen/base/SourceFileGenerator.java +++ b/java/dagger/internal/codegen/base/SourceFileGenerator.java @@ -28,7 +28,6 @@ import androidx.room.compiler.processing.XFiler; import androidx.room.compiler.processing.XMessager; import androidx.room.compiler.processing.XProcessingEnv; -import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.squareup.javapoet.AnnotationSpec; @@ -61,29 +60,15 @@ public SourceFileGenerator(SourceFileGenerator delegate) { this(delegate.filer, delegate.processingEnv); } - /** - * Generates a source file to be compiled for {@code T}. Writes any generation exception to {@code - * messager} and does not throw. - */ + /** Generates a source file to be compiled for {@code T}. */ public void generate(T input, XMessager messager) { - try { - generate(input); - } catch (SourceFileGenerationException e) { - e.printMessageTo(messager); - } + generate(input); } /** Generates a source file to be compiled for {@code T}. */ - public void generate(T input) throws SourceFileGenerationException { + public void generate(T input) { for (TypeSpec.Builder type : topLevelTypes(input)) { - try { - filer.write(buildJavaFile(input, type), XFiler.Mode.Isolating); - } catch (RuntimeException e) { - // if the code above threw a SFGE, use that - Throwables.propagateIfPossible(e, SourceFileGenerationException.class); - // otherwise, throw a new one - throw new SourceFileGenerationException(Optional.empty(), e, originatingElement(input)); - } + filer.write(buildJavaFile(input, type), XFiler.Mode.Isolating); } } diff --git a/java/dagger/internal/codegen/processingstep/AssistedFactoryProcessingStep.java b/java/dagger/internal/codegen/processingstep/AssistedFactoryProcessingStep.java index ebd5d106dc1..453c26a5ecc 100644 --- a/java/dagger/internal/codegen/processingstep/AssistedFactoryProcessingStep.java +++ b/java/dagger/internal/codegen/processingstep/AssistedFactoryProcessingStep.java @@ -57,7 +57,6 @@ import com.squareup.javapoet.ParameterizedTypeName; import com.squareup.javapoet.TypeName; import com.squareup.javapoet.TypeSpec; -import dagger.internal.codegen.base.SourceFileGenerationException; import dagger.internal.codegen.base.SourceFileGenerator; import dagger.internal.codegen.binding.AssistedInjectionAnnotations; import dagger.internal.codegen.binding.AssistedInjectionAnnotations.AssistedFactoryMetadata; @@ -110,12 +109,8 @@ protected void process(XTypeElement factory, ImmutableSet annotations ValidationReport report = new AssistedFactoryValidator().validate(factory); report.printMessagesTo(messager); if (report.isClean()) { - try { - ProvisionBinding binding = bindingFactory.assistedFactoryBinding(factory, Optional.empty()); - new AssistedFactoryImplGenerator().generate(binding); - } catch (SourceFileGenerationException e) { - e.printMessageTo(messager); - } + ProvisionBinding binding = bindingFactory.assistedFactoryBinding(factory, Optional.empty()); + new AssistedFactoryImplGenerator().generate(binding); } }