From 9e8a6bed6eaa228f9d242bcbcb9f837ced731f5c Mon Sep 17 00:00:00 2001 From: Reinhold Degenfellner Date: Wed, 29 Nov 2023 10:50:37 +0100 Subject: [PATCH] Remove unused problem variables --- .../IsolateTransformParametersCodec.kt | 4 +--- .../reflect/DefaultTypeValidationContext.java | 5 ++--- .../DefaultTypeMetadataStoreTest.groovy | 4 +--- ...efaultTypeAnnotationMetadataStoreTest.groovy | 4 +--- .../IncrementalExecutionIntegrationTest.groovy | 3 --- .../execution/impl/DefaultExecutionEngine.java | 7 ++----- .../impl/DefaultWorkValidationContext.java | 5 +---- .../execution/steps/ValidateStepTest.groovy | 3 +-- .../execution/TestExecutionEngineFactory.java | 5 +---- .../DefaultDependencyManagementServices.java | 7 +++---- .../DependencyManagementBuildScopeServices.java | 8 +++----- .../artifacts/transform/DefaultTransform.java | 17 +++++------------ .../DefaultTransformRegistrationFactory.java | 12 ++++-------- .../catalog/DefaultVersionCatalogBuilder.java | 4 +--- .../catalog/LibrariesSourceGenerator.java | 5 ----- .../component/ResolutionFailureHandler.java | 5 +---- .../DependencyGraphBuilderTest.groovy | 3 +-- .../ComponentMetadataDetailsAdapterTest.groovy | 3 +-- ...teMatchingArtifactVariantSelectorSpec.groovy | 4 +--- ...ultArtifactVariantSelectorFactoryTest.groovy | 3 +-- .../DefaultVariantTransformRegistryTest.groovy | 5 ++--- .../AbstractDependencyMetadataRulesTest.groovy | 3 +-- ...chingGraphArtifactVariantSelectorTest.groovy | 3 +-- .../LocalComponentDependencyMetadataTest.groovy | 3 +-- ...ultIncludedBuildTaskGraphParallelTest.groovy | 3 +-- .../gradle/execution/plan/TaskNodeFactory.java | 8 ++------ .../service/scopes/ExecutionGradleServices.java | 2 +- .../ExecuteActionsTaskExecuterTest.groovy | 5 +---- .../InspectionSchemeFactoryTest.groovy | 5 ++--- .../DefaultExecutionPlanParallelTest.groovy | 3 +-- .../plan/DefaultExecutionPlanTest.groovy | 4 +--- .../execution/plan/TaskNodeFactoryTest.groovy | 4 +--- .../DefaultTaskExecutionGraphSpec.groovy | 3 +-- .../fixtures/AbstractProjectBuilderSpec.groovy | 3 +-- 34 files changed, 48 insertions(+), 117 deletions(-) diff --git a/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/transform/IsolateTransformParametersCodec.kt b/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/transform/IsolateTransformParametersCodec.kt index c36eb7987507..5b5822c15b35 100644 --- a/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/transform/IsolateTransformParametersCodec.kt +++ b/platforms/core-configuration/configuration-cache/src/main/kotlin/org/gradle/configurationcache/serialization/codecs/transform/IsolateTransformParametersCodec.kt @@ -26,7 +26,6 @@ import org.gradle.configurationcache.extensions.uncheckedCast import org.gradle.configurationcache.serialization.Codec import org.gradle.configurationcache.serialization.ReadContext import org.gradle.configurationcache.serialization.WriteContext -import org.gradle.configurationcache.serialization.ownerService import org.gradle.internal.hash.ClassLoaderHierarchyHasher import org.gradle.internal.isolation.IsolatableFactory import org.gradle.internal.operations.BuildOperationExecutor @@ -60,8 +59,7 @@ class IsolateTransformParametersCodec( isolatableFactory, buildOperationExecutor, classLoaderHierarchyHasher, - fileCollectionFactory, - ownerService() + fileCollectionFactory ) } } diff --git a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java b/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java index 216fe3faaa0a..086c4af02a13 100644 --- a/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java +++ b/platforms/core-configuration/model-core/src/main/java/org/gradle/internal/reflect/DefaultTypeValidationContext.java @@ -20,9 +20,8 @@ import org.gradle.api.InvalidUserDataException; import org.gradle.api.problems.Problem; import org.gradle.api.problems.ProblemCategory; -import org.gradle.api.problems.internal.DefaultProblemCategory; -import org.gradle.api.problems.Problems; import org.gradle.api.problems.ReportableProblem; +import org.gradle.api.problems.internal.DefaultProblemCategory; import org.gradle.internal.exceptions.DefaultMultiCauseException; import org.gradle.internal.reflect.validation.TypeValidationProblemRenderer; import org.gradle.model.internal.type.ModelType; @@ -44,7 +43,7 @@ public static DefaultTypeValidationContext withRootType(Class rootType, boole return new DefaultTypeValidationContext(rootType, cacheable); } - public static DefaultTypeValidationContext withoutRootType(Problems problems, boolean reportCacheabilityProblems) { + public static DefaultTypeValidationContext withoutRootType(boolean reportCacheabilityProblems) { return new DefaultTypeValidationContext(null, reportCacheabilityProblems); } diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/properties/annotations/DefaultTypeMetadataStoreTest.groovy b/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/properties/annotations/DefaultTypeMetadataStoreTest.groovy index ddc2d62ba64f..0467669cdb19 100644 --- a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/properties/annotations/DefaultTypeMetadataStoreTest.groovy +++ b/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/properties/annotations/DefaultTypeMetadataStoreTest.groovy @@ -29,9 +29,7 @@ import org.gradle.api.internal.IConventionAware import org.gradle.api.internal.tasks.properties.DefaultPropertyTypeResolver import org.gradle.api.model.ReplacedBy import org.gradle.api.plugins.ExtensionAware -import org.gradle.api.problems.ProblemEmitter import org.gradle.api.problems.Severity -import org.gradle.api.problems.internal.DefaultProblems import org.gradle.api.provider.Property import org.gradle.api.tasks.Classpath import org.gradle.api.tasks.CompileClasspath @@ -460,7 +458,7 @@ class DefaultTypeMetadataStoreTest extends Specification implements ValidationMe } private List collectProblems(TypeMetadata metadata) { - def validationContext = DefaultTypeValidationContext.withoutRootType(new DefaultProblems(Stub(ProblemEmitter)), false) + def validationContext = DefaultTypeValidationContext.withoutRootType(false) metadata.visitValidationFailures(null, validationContext) return validationContext.problems.collect { normaliseLineSeparators(renderMinimalInformationAbout(it)) } } diff --git a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy b/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy index 7653f80b36ef..5095499f9732 100644 --- a/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy +++ b/platforms/core-configuration/model-core/src/test/groovy/org/gradle/internal/reflect/annotations/impl/DefaultTypeAnnotationMetadataStoreTest.groovy @@ -21,9 +21,7 @@ import groovy.transform.Memoized import groovy.transform.PackageScope import org.gradle.api.file.FileCollection import org.gradle.api.internal.DocumentationRegistry -import org.gradle.api.problems.ProblemEmitter import org.gradle.api.problems.Severity -import org.gradle.api.problems.internal.DefaultProblems import org.gradle.cache.internal.TestCrossBuildInMemoryCacheFactory import org.gradle.internal.reflect.DefaultTypeValidationContext import org.gradle.internal.reflect.annotations.AnnotationCategory @@ -777,7 +775,7 @@ class DefaultTypeAnnotationMetadataStoreTest extends Specification implements Va } } - def validationContext = DefaultTypeValidationContext.withoutRootType(new DefaultProblems(Stub(ProblemEmitter)), false) + def validationContext = DefaultTypeValidationContext.withoutRootType(false) metadata.visitValidationFailures(validationContext) List actualErrors = validationContext.problems .collect({ (normaliseLineSeparators(TypeValidationProblemRenderer.renderMinimalInformationAbout(it)) + (it.severity == Severity.ERROR ? " [STRICT]" : "") as String) }) diff --git a/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy b/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy index ee7e038e2706..a18b675b58e3 100644 --- a/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy +++ b/platforms/core-execution/execution/src/integTest/groovy/org/gradle/internal/execution/IncrementalExecutionIntegrationTest.groovy @@ -19,7 +19,6 @@ package org.gradle.internal.execution import com.google.common.collect.ImmutableList import com.google.common.collect.Iterables import org.gradle.api.internal.file.TestFiles -import org.gradle.api.problems.Problems import org.gradle.api.problems.Severity import org.gradle.cache.Cache import org.gradle.cache.ManualEvictionInMemoryCache @@ -106,7 +105,6 @@ class IncrementalExecutionIntegrationTest extends Specification implements Valid def changeDetector = new DefaultExecutionStateChangeDetector() def overlappingOutputDetector = new DefaultOverlappingOutputDetector() def deleter = TestFiles.deleter() - def problems = Stub(Problems) ExecutionEngine createExecutor() { TestExecutionEngineFactory.createExecutionEngine( @@ -119,7 +117,6 @@ class IncrementalExecutionIntegrationTest extends Specification implements Valid outputChangeListener, outputSnapshotter, overlappingOutputDetector, - problems, validationWarningReporter, virtualFileSystem ) diff --git a/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultExecutionEngine.java b/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultExecutionEngine.java index f1702cc7c45e..8733195a7a73 100644 --- a/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultExecutionEngine.java +++ b/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultExecutionEngine.java @@ -16,7 +16,6 @@ package org.gradle.internal.execution.impl; -import org.gradle.api.problems.Problems; import org.gradle.cache.Cache; import org.gradle.internal.Deferrable; import org.gradle.internal.Try; @@ -28,11 +27,9 @@ import org.gradle.internal.execution.steps.ExecutionRequestContext; public class DefaultExecutionEngine implements ExecutionEngine { - private final Problems problems; private final DeferredExecutionAwareStep executeStep; - public DefaultExecutionEngine(Problems problems, DeferredExecutionAwareStep executeStep) { - this.problems = problems; + public DefaultExecutionEngine(DeferredExecutionAwareStep executeStep) { this.executeStep = executeStep; } @@ -45,7 +42,7 @@ public Request createRequest(UnitOfWork work) { private ExecutionRequestContext createExecutionRequestContext() { WorkValidationContext validationContext = this.validationContext != null ? this.validationContext - : new DefaultWorkValidationContext(work.getTypeOriginInspector(), problems); + : new DefaultWorkValidationContext(work.getTypeOriginInspector()); return new ExecutionRequestContext(nonIncrementalReason, validationContext); } diff --git a/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultWorkValidationContext.java b/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultWorkValidationContext.java index ef78594a038f..7040914122f2 100644 --- a/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultWorkValidationContext.java +++ b/platforms/core-execution/execution/src/main/java/org/gradle/internal/execution/impl/DefaultWorkValidationContext.java @@ -18,7 +18,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSortedSet; -import org.gradle.api.problems.Problems; import org.gradle.api.problems.ReportableProblem; import org.gradle.internal.execution.WorkValidationContext; import org.gradle.internal.reflect.ProblemRecordingTypeValidationContext; @@ -39,10 +38,8 @@ public class DefaultWorkValidationContext implements WorkValidationContext { private final Set> types = new HashSet<>(); private final ImmutableList.Builder problems = builder(); private final TypeOriginInspector typeOriginInspector; - private final Problems problemsService; - public DefaultWorkValidationContext(TypeOriginInspector typeOriginInspector, Problems problemsService) { - this.problemsService = problemsService; + public DefaultWorkValidationContext(TypeOriginInspector typeOriginInspector) { this.typeOriginInspector = typeOriginInspector; } diff --git a/platforms/core-execution/execution/src/test/groovy/org/gradle/internal/execution/steps/ValidateStepTest.groovy b/platforms/core-execution/execution/src/test/groovy/org/gradle/internal/execution/steps/ValidateStepTest.groovy index 7345bc1f3868..a06eb97970c3 100644 --- a/platforms/core-execution/execution/src/test/groovy/org/gradle/internal/execution/steps/ValidateStepTest.groovy +++ b/platforms/core-execution/execution/src/test/groovy/org/gradle/internal/execution/steps/ValidateStepTest.groovy @@ -17,7 +17,6 @@ package org.gradle.internal.execution.steps import org.gradle.api.problems.Problem -import org.gradle.api.problems.Problems import org.gradle.api.problems.Severity import org.gradle.internal.execution.WorkValidationContext import org.gradle.internal.execution.WorkValidationException @@ -43,7 +42,7 @@ class ValidateStepTest extends StepSpec implements Valid def delegateResult = Mock(Result) def setup() { - def validationContext = new DefaultWorkValidationContext(WorkValidationContext.TypeOriginInspector.NO_OP, Stub(Problems)) + def validationContext = new DefaultWorkValidationContext(WorkValidationContext.TypeOriginInspector.NO_OP) context.getValidationContext() >> validationContext } diff --git a/platforms/core-execution/execution/src/testFixtures/groovy/org/gradle/internal/execution/TestExecutionEngineFactory.java b/platforms/core-execution/execution/src/testFixtures/groovy/org/gradle/internal/execution/TestExecutionEngineFactory.java index a2bf99786969..1b5c751c4a71 100644 --- a/platforms/core-execution/execution/src/testFixtures/groovy/org/gradle/internal/execution/TestExecutionEngineFactory.java +++ b/platforms/core-execution/execution/src/testFixtures/groovy/org/gradle/internal/execution/TestExecutionEngineFactory.java @@ -16,7 +16,6 @@ package org.gradle.internal.execution; -import org.gradle.api.problems.Problems; import org.gradle.caching.internal.controller.BuildCacheController; import org.gradle.internal.execution.history.OverlappingOutputDetector; import org.gradle.internal.execution.history.changes.ExecutionStateChangeDetector; @@ -52,7 +51,6 @@ public class TestExecutionEngineFactory { public static ExecutionEngine createExecutionEngine( UniqueId buildId, - BuildCacheController buildCacheController, BuildOperationExecutor buildOperationExecutor, ClassLoaderHierarchyHasher classloaderHierarchyHasher, @@ -61,12 +59,11 @@ public static ExecutionEngine createExecutionEngine( OutputChangeListener outputChangeListener, OutputSnapshotter outputSnapshotter, OverlappingOutputDetector overlappingOutputDetector, - Problems problems, ValidateStep.ValidationWarningRecorder validationWarningReporter, VirtualFileSystem virtualFileSystem ) { // @formatter:off - return new DefaultExecutionEngine(problems, + return new DefaultExecutionEngine( new IdentifyStep<>(buildOperationExecutor, new IdentityCacheStep<>( new AssignMutableWorkspaceStep<>( diff --git a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java index 9d6228aaafb7..d9756fbd4067 100644 --- a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java +++ b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DefaultDependencyManagementServices.java @@ -298,8 +298,7 @@ TransformRegistrationFactory createTransformRegistrationFactory( domainObjectContext, parameterScheme, actionScheme, - internalServices, - problems + internalServices ); } @@ -519,8 +518,8 @@ GlobalDependencyResolutionRules createModuleMetadataHandler(ComponentMetadataPro return new DefaultGlobalDependencyResolutionRules(componentMetadataProcessorFactory, moduleMetadataProcessor, rules); } - ResolutionFailureHandler createResolutionFailureProcessor(Problems problems, DocumentationRegistry documentationRegistry) { - return new ResolutionFailureHandler(problems, documentationRegistry); + ResolutionFailureHandler createResolutionFailureProcessor(DocumentationRegistry documentationRegistry) { + return new ResolutionFailureHandler(documentationRegistry); } GraphVariantSelector createGraphVariantSelector(ResolutionFailureHandler resolutionFailureHandler) { diff --git a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java index f505064c03cd..7ba315477b7d 100644 --- a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java +++ b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/DependencyManagementBuildScopeServices.java @@ -84,7 +84,6 @@ import org.gradle.api.internal.tasks.TaskDependencyFactory; import org.gradle.api.model.BuildTreeObjectFactory; import org.gradle.api.model.ObjectFactory; -import org.gradle.api.problems.Problems; import org.gradle.cache.internal.CleaningInMemoryCacheDecoratorFactory; import org.gradle.cache.internal.GeneratedGradleJarCache; import org.gradle.cache.internal.InMemoryCacheDecoratorFactory; @@ -377,8 +376,8 @@ public ResolvedVariant computeIfAbsent(VariantResolveMetadata.Identifier key, Fu }; } - ResolutionFailureHandler createResolutionFailureProcessor(Problems problems, DocumentationRegistry documentationRegistry) { - return new ResolutionFailureHandler(problems, documentationRegistry); + ResolutionFailureHandler createResolutionFailureProcessor(DocumentationRegistry documentationRegistry) { + return new ResolutionFailureHandler(documentationRegistry); } GraphVariantSelector createGraphVariantSelector(ResolutionFailureHandler resolutionFailureHandler) { @@ -484,7 +483,6 @@ ExecutionEngine createExecutionEngine( ListenerManager listenerManager, ImmutableWorkspaceMetadataStore immutableWorkspaceMetadataStore, OutputSnapshotter outputSnapshotter, - Problems problems, TimeoutHandler timeoutHandler, ValidateStep.ValidationWarningRecorder validationWarningRecorder, VirtualFileSystem virtualFileSystem @@ -492,7 +490,7 @@ ExecutionEngine createExecutionEngine( OutputChangeListener outputChangeListener = listenerManager.getBroadcaster(OutputChangeListener.class); // @formatter:off - return new DefaultExecutionEngine(problems, + return new DefaultExecutionEngine( new IdentifyStep<>(buildOperationExecutor, new IdentityCacheStep<>( new AssignImmutableWorkspaceStep<>(deleter, fileSystemAccess, immutableWorkspaceMetadataStore, outputSnapshotter, diff --git a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransform.java b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransform.java index 2851e7a4dffd..69c14c55a9c8 100644 --- a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransform.java +++ b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransform.java @@ -37,7 +37,6 @@ import org.gradle.api.internal.tasks.properties.FileParameterUtils; import org.gradle.api.internal.tasks.properties.InputParameterUtils; import org.gradle.api.problems.Problem; -import org.gradle.api.problems.Problems; import org.gradle.api.provider.Provider; import org.gradle.api.reflect.InjectionPointQualifier; import org.gradle.internal.Describables; @@ -94,8 +93,8 @@ import static com.google.common.collect.ImmutableList.toImmutableList; import static org.gradle.api.internal.tasks.properties.AbstractValidatingProperty.reportValueNotSet; -import static org.gradle.api.problems.internal.DefaultProblemCategory.VALIDATION; import static org.gradle.api.problems.Severity.ERROR; +import static org.gradle.api.problems.internal.DefaultProblemCategory.VALIDATION; import static org.gradle.internal.deprecation.Documentation.userManual; public class DefaultTransform implements Transform { @@ -138,8 +137,7 @@ public DefaultTransform( InstantiationScheme actionInstantiationScheme, DomainObjectContext owner, CalculatedValueContainerFactory calculatedValueContainerFactory, - ServiceLookup internalServices, - Problems problems + ServiceLookup internalServices ) { this.implementationClass = implementationClass; this.fromAttributes = fromAttributes; @@ -158,7 +156,7 @@ public DefaultTransform( this.dependenciesLineEndingSensitivity = dependenciesLineEndingSensitivity; this.isolatedParameters = calculatedValueContainerFactory.create(Describables.of("parameters of", this), new IsolateTransformParameters(parameterObject, implementationClass, cacheable, owner, parameterPropertyWalker, isolatableFactory, buildOperationExecutor, classLoaderHierarchyHasher, - fileCollectionFactory, problems)); + fileCollectionFactory)); } /** @@ -294,7 +292,6 @@ public void isolateParametersIfNotAlready() { private static final String ARTIFACT_TRANSFORM_SHOULD_NOT_DECLARE_OUTPUT = "ARTIFACT_TRANSFORM_SHOULD_NOT_DECLARE_OUTPUT"; private static void fingerprintParameters( - Problems problems, InputFingerprinter inputFingerprinter, FileCollectionFactory fileCollectionFactory, PropertyWalker propertyWalker, @@ -302,7 +299,7 @@ private static void fingerprintParameters( Object parameterObject, boolean cacheable ) { - DefaultTypeValidationContext validationContext = DefaultTypeValidationContext.withoutRootType(problems, cacheable); + DefaultTypeValidationContext validationContext = DefaultTypeValidationContext.withoutRootType(cacheable); InputFingerprinter.Result result = inputFingerprinter.fingerprintInputProperties( ImmutableSortedMap.of(), ImmutableSortedMap.of(), @@ -570,7 +567,6 @@ public static class IsolateTransformParameters implements ValueCalculator implementationClass; @@ -583,8 +579,7 @@ public IsolateTransformParameters( IsolatableFactory isolatableFactory, BuildOperationExecutor buildOperationExecutor, ClassLoaderHierarchyHasher classLoaderHierarchyHasher, - FileCollectionFactory fileCollectionFactory, - Problems problems + FileCollectionFactory fileCollectionFactory ) { this.parameterObject = parameterObject; this.implementationClass = implementationClass; @@ -595,7 +590,6 @@ public IsolateTransformParameters( this.buildOperationExecutor = buildOperationExecutor; this.classLoaderHierarchyHasher = classLoaderHierarchyHasher; this.fileCollectionFactory = fileCollectionFactory; - this.problems = problems; } @Nullable @@ -697,7 +691,6 @@ private IsolatedParameters isolateParametersExclusively(InputFingerprinter input public void run(BuildOperationContext context) { // TODO wolfs - schedule fingerprinting separately, it can be done without having the project lock fingerprintParameters( - problems, inputFingerprinter, fileCollectionFactory, parameterPropertyWalker, diff --git a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransformRegistrationFactory.java b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransformRegistrationFactory.java index 24a7be854382..e6536c480a65 100644 --- a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransformRegistrationFactory.java +++ b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/artifacts/transform/DefaultTransformRegistrationFactory.java @@ -27,7 +27,6 @@ import org.gradle.api.internal.file.FileCollectionFactory; import org.gradle.api.internal.file.FileLookup; import org.gradle.api.internal.tasks.properties.FileParameterUtils; -import org.gradle.api.problems.Problems; import org.gradle.internal.execution.InputFingerprinter; import org.gradle.internal.fingerprint.DirectorySensitivity; import org.gradle.internal.fingerprint.FileNormalizer; @@ -66,7 +65,6 @@ public class DefaultTransformRegistrationFactory implements TransformRegistratio private final CalculatedValueContainerFactory calculatedValueContainerFactory; private final DomainObjectContext owner; private final InstantiationScheme actionInstantiationScheme; - private final Problems problems; public DefaultTransformRegistrationFactory( BuildOperationExecutor buildOperationExecutor, @@ -80,8 +78,7 @@ public DefaultTransformRegistrationFactory( DomainObjectContext owner, TransformParameterScheme parameterScheme, TransformActionScheme actionScheme, - ServiceLookup internalServices, - Problems problems + ServiceLookup internalServices ) { this.buildOperationExecutor = buildOperationExecutor; this.isolatableFactory = isolatableFactory; @@ -96,14 +93,13 @@ public DefaultTransformRegistrationFactory( this.actionMetadataStore = actionScheme.getInspectionScheme().getMetadataStore(); this.parametersPropertyWalker = parameterScheme.getInspectionScheme().getPropertyWalker(); this.internalServices = internalServices; - this.problems = problems; } @Override public TransformRegistration create(ImmutableAttributes from, ImmutableAttributes to, Class> implementation, @Nullable TransformParameters parameterObject) { TypeMetadata actionMetadata = actionMetadataStore.getTypeMetadata(implementation); boolean cacheable = implementation.isAnnotationPresent(CacheableTransform.class); - DefaultTypeValidationContext validationContext = DefaultTypeValidationContext.withoutRootType(problems, cacheable); + DefaultTypeValidationContext validationContext = DefaultTypeValidationContext.withoutRootType(cacheable); actionMetadata.visitValidationFailures(null, validationContext); // Should retain this on the metadata rather than calculate on each invocation @@ -153,8 +149,8 @@ public TransformRegistration create(ImmutableAttributes from, ImmutableAttribute actionInstantiationScheme, owner, calculatedValueContainerFactory, - internalServices, - problems); + internalServices + ); return new DefaultTransformRegistration(from, to, new TransformStep(transform, transformInvocationFactory, owner, inputFingerprinter)); } diff --git a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/DefaultVersionCatalogBuilder.java b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/DefaultVersionCatalogBuilder.java index e09a532b4a08..efe3676bb9ab 100644 --- a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/DefaultVersionCatalogBuilder.java +++ b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/DefaultVersionCatalogBuilder.java @@ -83,8 +83,8 @@ import static org.gradle.api.internal.catalog.problems.VersionCatalogProblemId.UNDEFINED_VERSION_REFERENCE; import static org.gradle.api.internal.catalog.problems.VersionCatalogProblemId.UNSUPPORTED_FILE_FORMAT; import static org.gradle.api.problems.Severity.ERROR; -import static org.gradle.internal.deprecation.Documentation.userManual; import static org.gradle.internal.RenderingUtils.oxfordListOf; +import static org.gradle.internal.deprecation.Documentation.userManual; public abstract class DefaultVersionCatalogBuilder implements VersionCatalogBuilderInternal { @@ -127,8 +127,6 @@ public String toString() { private Import importedCatalog = null; private final StrictVersionParser strictVersionParser; - // @Inject -// private final Problems problemsService; private final Property description; private String currentContext; diff --git a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/LibrariesSourceGenerator.java b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/LibrariesSourceGenerator.java index a104eb4ccc53..1d8a0fb9dd91 100644 --- a/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/LibrariesSourceGenerator.java +++ b/platforms/software/dependency-management/src/main/java/org/gradle/api/internal/catalog/LibrariesSourceGenerator.java @@ -33,7 +33,6 @@ import org.gradle.api.problems.ProblemBuilderDefiningLabel; import org.gradle.api.problems.Problems; import org.gradle.api.problems.ReportableProblem; -import org.gradle.api.problems.ReportableProblemBuilder; import org.gradle.api.provider.Provider; import org.gradle.api.provider.ProviderFactory; import org.gradle.internal.deprecation.DeprecationLogger; @@ -532,10 +531,6 @@ private static ProblemBuilder configureVersionCatalogError(ProblemBuilderDefinin .severity(ERROR); } - private RuntimeException throwVersionCatalogProblemException(ReportableProblemBuilder problem) { - throw throwErrorWithNewProblemsApi(ERROR_HEADER, ImmutableList.of(problem.build())); - } - private void assertUnique(List names, String prefix, String suffix) { List errors = names.stream() .collect(groupingBy(AbstractSourceGenerator::toJavaName)) diff --git a/platforms/software/dependency-management/src/main/java/org/gradle/internal/component/ResolutionFailureHandler.java b/platforms/software/dependency-management/src/main/java/org/gradle/internal/component/ResolutionFailureHandler.java index e04c11de4979..cb6d471271d4 100644 --- a/platforms/software/dependency-management/src/main/java/org/gradle/internal/component/ResolutionFailureHandler.java +++ b/platforms/software/dependency-management/src/main/java/org/gradle/internal/component/ResolutionFailureHandler.java @@ -90,12 +90,9 @@ public class ResolutionFailureHandler { private static final String INCOMPATIBLE_VARIANTS_SECTION = "sub:variant-incompatible"; private static final String AMBIGUOUS_TRANSFORMATION_SECTION = "sub:transform-ambiguity"; - @SuppressWarnings("FieldCanBeLocal") - private final Problems problemsService; private final DocumentationRegistry documentationRegistry; - public ResolutionFailureHandler(Problems problemsService, DocumentationRegistry documentationRegistry) { - this.problemsService = problemsService; + public ResolutionFailureHandler(DocumentationRegistry documentationRegistry) { this.documentationRegistry = documentationRegistry; } diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy index 6ff423976b7a..4282f54d85da 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/ivyservice/resolveengine/DependencyGraphBuilderTest.groovy @@ -86,7 +86,6 @@ import org.gradle.util.TestUtil import spock.lang.Specification import static org.gradle.api.internal.artifacts.DefaultModuleVersionIdentifier.newId -import static org.gradle.api.problems.TestProblemsUtil.createTestProblems import static org.gradle.internal.component.external.model.DefaultModuleComponentSelector.newSelector import static org.gradle.internal.component.local.model.TestComponentIdentifiers.newProjectId @@ -129,7 +128,7 @@ class DependencyGraphBuilderTest extends Specification { def desugaring = new AttributeDesugaring(AttributeTestUtil.attributesFactory()) def resolveStateFactory = new LocalComponentGraphResolveStateFactory(desugaring, new ComponentIdGenerator()) def documentationRegistry = new DocumentationRegistry() - def variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(createTestProblems(), documentationRegistry)) + def variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(documentationRegistry)) DependencyGraphBuilder builder diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataDetailsAdapterTest.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataDetailsAdapterTest.groovy index e788a3ec326c..86555b94fb43 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataDetailsAdapterTest.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/repositories/resolver/ComponentMetadataDetailsAdapterTest.groovy @@ -41,7 +41,6 @@ import org.gradle.util.TestUtil import org.gradle.util.internal.SimpleMapInterner import spock.lang.Specification -import static org.gradle.api.problems.TestProblemsUtil.createTestProblems import static org.gradle.internal.component.external.model.DefaultModuleComponentSelector.newSelector class ComponentMetadataDetailsAdapterTest extends Specification { @@ -161,7 +160,7 @@ class ComponentMetadataDetailsAdapterTest extends Specification { def componentSelector = newSelector(DefaultModuleIdentifier.newId(consumerIdentifier.group, consumerIdentifier.name), new DefaultMutableVersionConstraint(consumerIdentifier.version)) def consumer = new LocalComponentDependencyMetadata(componentSelector, ImmutableAttributes.EMPTY, null, [] as List, [], false, false, true, false, false, null) def state = DependencyManagementTestUtil.modelGraphResolveFactory().stateFor(immutable) - def variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(createTestProblems(), new DocumentationRegistry())) + def variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(new DocumentationRegistry())) def variant = consumer.selectVariants(variantSelector, attributes, state, schema, [] as Set).variants[0] variant.metadata.dependencies diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/AttributeMatchingArtifactVariantSelectorSpec.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/AttributeMatchingArtifactVariantSelectorSpec.groovy index 92619745596e..1d811e389eba 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/AttributeMatchingArtifactVariantSelectorSpec.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/AttributeMatchingArtifactVariantSelectorSpec.groovy @@ -30,8 +30,6 @@ import org.gradle.internal.component.model.AttributeMatcher import org.gradle.util.AttributeTestUtil import spock.lang.Specification -import static org.gradle.api.problems.TestProblemsUtil.createTestProblems - class AttributeMatchingArtifactVariantSelectorSpec extends Specification { def consumerProvidedVariantFinder = Mock(ConsumerProvidedVariantFinder) @@ -59,7 +57,7 @@ class AttributeMatchingArtifactVariantSelectorSpec extends Specification { } def factory = Mock(ArtifactVariantSelector.ResolvedArtifactTransformer) - def failureProcessor = new ResolutionFailureHandler(createTestProblems(), new DocumentationRegistry()) + def failureProcessor = new ResolutionFailureHandler(new DocumentationRegistry()) def 'direct match on variant means no finder interaction'() { given: diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultArtifactVariantSelectorFactoryTest.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultArtifactVariantSelectorFactoryTest.groovy index b4b3d7933168..fca898dcb6b9 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultArtifactVariantSelectorFactoryTest.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultArtifactVariantSelectorFactoryTest.groovy @@ -36,7 +36,6 @@ import org.gradle.util.AttributeTestUtil import spock.lang.Specification import static org.gradle.api.artifacts.type.ArtifactTypeDefinition.ARTIFACT_TYPE_ATTRIBUTE -import static org.gradle.api.problems.TestProblemsUtil.createTestProblems import static org.gradle.util.internal.TextUtil.toPlatformLineSeparators class DefaultArtifactVariantSelectorFactoryTest extends Specification { @@ -49,7 +48,7 @@ class DefaultArtifactVariantSelectorFactoryTest extends Specification { def factory = Mock(ArtifactVariantSelector.ResolvedArtifactTransformer) def dependenciesResolverFactory = Stub(TransformUpstreamDependenciesResolverFactory) def transformedVariantFactory = Mock(TransformedVariantFactory) - def variantSelectionFailureProcessor = new ResolutionFailureHandler(createTestProblems(), new DocumentationRegistry()) + def variantSelectionFailureProcessor = new ResolutionFailureHandler(new DocumentationRegistry()) def variantSelectorFactory = new DefaultVariantSelectorFactory(matchingCache, consumerSchema, AttributeTestUtil.attributesFactory(), transformedVariantFactory, variantSelectionFailureProcessor) def "selects producer variant with requested attributes"() { diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultVariantTransformRegistryTest.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultVariantTransformRegistryTest.groovy index 48675d07a3e6..0f08ff0da2bf 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultVariantTransformRegistryTest.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/api/internal/artifacts/transform/DefaultVariantTransformRegistryTest.groovy @@ -32,7 +32,6 @@ import org.gradle.api.internal.file.FileLookup import org.gradle.api.internal.initialization.RootScriptDomainObjectContext import org.gradle.api.internal.tasks.properties.InspectionScheme import org.gradle.api.plugins.ExtensionAware -import org.gradle.api.problems.Problems import org.gradle.internal.execution.InputFingerprinter import org.gradle.internal.hash.ClassLoaderHierarchyHasher import org.gradle.internal.hash.TestHashCodes @@ -91,8 +90,8 @@ class DefaultVariantTransformRegistryTest extends Specification { ), inspectionScheme ), - Stub(ServiceLookup), - Stub(Problems) + Stub(ServiceLookup) + ) def registry = new DefaultVariantTransformRegistry(instantiatorFactory, attributesFactory, Stub(ServiceRegistry), registryFactory, instantiatorFactory.injectScheme()) diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/AbstractDependencyMetadataRulesTest.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/AbstractDependencyMetadataRulesTest.groovy index 734cb1dc616e..edb6439d3e06 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/AbstractDependencyMetadataRulesTest.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/external/model/AbstractDependencyMetadataRulesTest.groovy @@ -47,7 +47,6 @@ import org.gradle.util.internal.SimpleMapInterner import spock.lang.Shared import spock.lang.Specification -import static org.gradle.api.problems.TestProblemsUtil.createTestProblems import static org.gradle.internal.component.external.model.DefaultModuleComponentSelector.newSelector abstract class AbstractDependencyMetadataRulesTest extends Specification { @@ -286,7 +285,7 @@ abstract class AbstractDependencyMetadataRulesTest extends Specification { def consumer = new LocalComponentDependencyMetadata(componentSelector, ImmutableAttributes.EMPTY, null, [] as List, [], false, false, true, false, false, null) def state = DependencyManagementTestUtil.modelGraphResolveFactory().stateFor(immutable) def documentationRegistry = new DocumentationRegistry() - def variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(createTestProblems(), documentationRegistry)) + def variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(documentationRegistry)) return consumer.selectVariants(variantSelector, attributes, state, schema, [] as Set).variants[0].metadata } diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/AttributeMatchingGraphArtifactVariantSelectorTest.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/AttributeMatchingGraphArtifactVariantSelectorTest.groovy index dbde1ca9d5a9..2952610bb5d3 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/AttributeMatchingGraphArtifactVariantSelectorTest.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/AttributeMatchingGraphArtifactVariantSelectorTest.groovy @@ -39,7 +39,6 @@ import org.gradle.util.TestUtil import org.gradle.util.internal.TextUtil import spock.lang.Specification -import static org.gradle.api.problems.TestProblemsUtil.createTestProblems import static org.gradle.util.AttributeTestUtil.attributes class AttributeMatchingGraphArtifactVariantSelectorTest extends Specification { @@ -463,7 +462,7 @@ All of them match the consumer attributes: } private void performSelection() { - GraphVariantSelector variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(createTestProblems(), new DocumentationRegistry())) + GraphVariantSelector variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(new DocumentationRegistry())) selected = variantSelector.selectVariants( consumerAttributes, requestedCapabilities, diff --git a/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/LocalComponentDependencyMetadataTest.groovy b/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/LocalComponentDependencyMetadataTest.groovy index bfc3815ffbd8..f0f010e524cd 100644 --- a/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/LocalComponentDependencyMetadataTest.groovy +++ b/platforms/software/dependency-management/src/test/groovy/org/gradle/internal/component/model/LocalComponentDependencyMetadataTest.groovy @@ -44,7 +44,6 @@ import org.gradle.util.TestUtil import spock.lang.Specification import spock.lang.Unroll -import static org.gradle.api.problems.TestProblemsUtil.createTestProblems import static com.google.common.collect.ImmutableList.copyOf import static org.gradle.util.internal.TextUtil.toPlatformLineSeparators @@ -56,7 +55,7 @@ class LocalComponentDependencyMetadataTest extends Specification { def setup() { attributesSchema = new DefaultAttributesSchema(TestUtil.instantiatorFactory(), SnapshotTestUtil.isolatableFactory()) factory = AttributeTestUtil.attributesFactory() - variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(createTestProblems(), new DocumentationRegistry())) + variantSelector = new GraphVariantSelector(new ResolutionFailureHandler(new DocumentationRegistry())) } def "returns this when same target requested"() { diff --git a/subprojects/composite-builds/src/test/groovy/org/gradle/composite/internal/DefaultIncludedBuildTaskGraphParallelTest.groovy b/subprojects/composite-builds/src/test/groovy/org/gradle/composite/internal/DefaultIncludedBuildTaskGraphParallelTest.groovy index b74205e1dabe..9e9838dd3659 100644 --- a/subprojects/composite-builds/src/test/groovy/org/gradle/composite/internal/DefaultIncludedBuildTaskGraphParallelTest.groovy +++ b/subprojects/composite-builds/src/test/groovy/org/gradle/composite/internal/DefaultIncludedBuildTaskGraphParallelTest.groovy @@ -32,7 +32,6 @@ import org.gradle.api.internal.project.taskfactory.TestTaskIdentities import org.gradle.api.internal.tasks.NodeExecutionContext import org.gradle.api.internal.tasks.TaskDestroyablesInternal import org.gradle.api.internal.tasks.TaskLocalStateInternal -import org.gradle.api.problems.Problems import org.gradle.api.tasks.TaskDependency import org.gradle.execution.plan.BuildWorkPlan import org.gradle.execution.plan.DefaultExecutionPlan @@ -296,7 +295,7 @@ class DefaultIncludedBuildTaskGraphParallelTest extends AbstractIncludedBuildTas private BuildWorkGraphController buildWorkGraphController(String displayName, BuildServices services) { def builder = Mock(BuildLifecycleController.WorkGraphBuilder) - def nodeFactory = new TaskNodeFactory(services.gradle, Stub(BuildTreeWorkGraphController), Stub(NodeValidator), new TestBuildOperationExecutor(), new ExecutionNodeAccessHierarchies(CaseSensitivity.CASE_INSENSITIVE, Stub(Stat)), Stub(Problems)) + def nodeFactory = new TaskNodeFactory(services.gradle, Stub(BuildTreeWorkGraphController), Stub(NodeValidator), new TestBuildOperationExecutor(), new ExecutionNodeAccessHierarchies(CaseSensitivity.CASE_INSENSITIVE, Stub(Stat))) def hierarchies = new ExecutionNodeAccessHierarchies(CaseSensitivity.CASE_SENSITIVE, TestFiles.fileSystem()) def dependencyResolver = Stub(TaskDependencyResolver) _ * dependencyResolver.resolveDependenciesFor(_, _) >> { TaskInternal task, Object dependencies -> diff --git a/subprojects/core/src/main/java/org/gradle/execution/plan/TaskNodeFactory.java b/subprojects/core/src/main/java/org/gradle/execution/plan/TaskNodeFactory.java index 30c10a0eba8a..71f2dbb2d28f 100644 --- a/subprojects/core/src/main/java/org/gradle/execution/plan/TaskNodeFactory.java +++ b/subprojects/core/src/main/java/org/gradle/execution/plan/TaskNodeFactory.java @@ -26,7 +26,6 @@ import org.gradle.api.internal.plugins.PluginManagerInternal; import org.gradle.api.internal.project.ProjectInternal; import org.gradle.api.plugins.PluginContainer; -import org.gradle.api.problems.Problems; import org.gradle.composite.internal.BuildTreeWorkGraphController; import org.gradle.internal.Cast; import org.gradle.internal.execution.WorkValidationContext; @@ -52,7 +51,6 @@ public class TaskNodeFactory { private final Map nodes = new HashMap<>(); private final BuildTreeWorkGraphController workGraphController; - private final Problems problems; private final GradleInternal thisBuild; private final DefaultTypeOriginInspectorFactory typeOriginInspectorFactory; private final Function resolveMutationsNodeFactory; @@ -62,12 +60,10 @@ public TaskNodeFactory( BuildTreeWorkGraphController workGraphController, NodeValidator nodeValidator, BuildOperationRunner buildOperationRunner, - ExecutionNodeAccessHierarchies accessHierarchies, - Problems problems + ExecutionNodeAccessHierarchies accessHierarchies ) { this.thisBuild = thisBuild; this.workGraphController = workGraphController; - this.problems = problems; this.typeOriginInspectorFactory = new DefaultTypeOriginInspectorFactory(); resolveMutationsNodeFactory = localTaskNode -> new ResolveMutationsNode(localTaskNode, nodeValidator, buildOperationRunner, accessHierarchies); } @@ -85,7 +81,7 @@ public TaskNode getOrCreateNode(Task task) { TaskNode node = nodes.get(task); if (node == null) { if (((ProjectInternal) task.getProject()).getGradle().getIdentityPath().equals(thisBuild.getIdentityPath())) { - node = new LocalTaskNode((TaskInternal) task, new DefaultWorkValidationContext(typeOriginInspectorFactory.forTask(task), problems), resolveMutationsNodeFactory); + node = new LocalTaskNode((TaskInternal) task, new DefaultWorkValidationContext(typeOriginInspectorFactory.forTask(task)), resolveMutationsNodeFactory); } else { node = TaskInAnotherBuild.of((TaskInternal) task, workGraphController); } diff --git a/subprojects/core/src/main/java/org/gradle/internal/service/scopes/ExecutionGradleServices.java b/subprojects/core/src/main/java/org/gradle/internal/service/scopes/ExecutionGradleServices.java index 3cd3cc879a2a..300c4f5de725 100644 --- a/subprojects/core/src/main/java/org/gradle/internal/service/scopes/ExecutionGradleServices.java +++ b/subprojects/core/src/main/java/org/gradle/internal/service/scopes/ExecutionGradleServices.java @@ -201,7 +201,7 @@ public ExecutionEngine createExecutionEngine( sharedExecutionPipeline ))))))))))))))))); - return new DefaultExecutionEngine(problems, + return new DefaultExecutionEngine( new IdentifyStep<>(buildOperationExecutor, new IdentityCacheStep<>( new ExecuteWorkBuildOperationFiringStep<>(buildOperationExecutor, diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/execution/ExecuteActionsTaskExecuterTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/execution/ExecuteActionsTaskExecuterTest.groovy index 2b4618758d12..4f8593b1f5d5 100644 --- a/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/execution/ExecuteActionsTaskExecuterTest.groovy +++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/execution/ExecuteActionsTaskExecuterTest.groovy @@ -29,7 +29,6 @@ import org.gradle.api.internal.tasks.TaskExecutionContext import org.gradle.api.internal.tasks.TaskExecutionOutcome import org.gradle.api.internal.tasks.TaskStateInternal import org.gradle.api.internal.tasks.properties.TaskProperties -import org.gradle.api.problems.Problems import org.gradle.api.tasks.StopActionException import org.gradle.api.tasks.StopExecutionException import org.gradle.api.tasks.TaskExecutionException @@ -101,7 +100,7 @@ class ExecuteActionsTaskExecuterTest extends Specification { getOutputFilesProducedByWork() >> ImmutableSortedMap.of() } - def validationContext = new DefaultWorkValidationContext(WorkValidationContext.TypeOriginInspector.NO_OP, Mock(Problems)) + def validationContext = new DefaultWorkValidationContext(WorkValidationContext.TypeOriginInspector.NO_OP) def executionContext = Mock(TaskExecutionContext) def scriptSource = Mock(ScriptSource) def standardOutputCapture = Mock(StandardOutputCapture) @@ -139,7 +138,6 @@ class ExecuteActionsTaskExecuterTest extends Specification { def fileCollectionFactory = fileCollectionFactory() def deleter = deleter() def validationWarningReporter = Stub(ValidateStep.ValidationWarningRecorder) - def problems = Stub(Problems) // TODO Make this test work with a mock execution engine def executionEngine = TestExecutionEngineFactory.createExecutionEngine( @@ -152,7 +150,6 @@ class ExecuteActionsTaskExecuterTest extends Specification { outputChangeListener, outputSnapshotter, overlappingOutputDetector, - problems, validationWarningReporter, virtualFileSystem ) diff --git a/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/properties/InspectionSchemeFactoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/properties/InspectionSchemeFactoryTest.groovy index 8ad5dff53a7c..51d3195e7d4c 100644 --- a/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/properties/InspectionSchemeFactoryTest.groovy +++ b/subprojects/core/src/test/groovy/org/gradle/api/internal/tasks/properties/InspectionSchemeFactoryTest.groovy @@ -18,7 +18,6 @@ package org.gradle.api.internal.tasks.properties import org.gradle.api.file.ConfigurableFileCollection import org.gradle.api.internal.DocumentationRegistry -import org.gradle.api.problems.Problems import org.gradle.api.provider.Property import org.gradle.cache.internal.TestCrossBuildInMemoryCacheFactory import org.gradle.internal.instantiation.InstantiationScheme @@ -64,7 +63,7 @@ class InspectionSchemeFactoryTest extends Specification { metadata.propertiesMetadata.size() == 2 when: - def validationContext = DefaultTypeValidationContext.withoutRootType(Mock(Problems), false) + def validationContext = DefaultTypeValidationContext.withoutRootType(false) metadata.visitValidationFailures(null, validationContext) then: @@ -90,7 +89,7 @@ class InspectionSchemeFactoryTest extends Specification { metadata.propertiesMetadata.size() == 2 when: - def validationContext = DefaultTypeValidationContext.withoutRootType(Mock(Problems), false) + def validationContext = DefaultTypeValidationContext.withoutRootType(false) metadata.visitValidationFailures(null, validationContext) then: diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanParallelTest.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanParallelTest.groovy index 730e8e8e22f4..9966827b6f43 100644 --- a/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanParallelTest.groovy +++ b/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanParallelTest.groovy @@ -24,7 +24,6 @@ import org.gradle.api.internal.project.ProjectInternal import org.gradle.api.internal.project.taskfactory.TestTaskIdentities import org.gradle.api.internal.tasks.NodeExecutionContext import org.gradle.api.internal.tasks.TaskStateInternal -import org.gradle.api.problems.Problems import org.gradle.api.tasks.Destroys import org.gradle.api.tasks.InputDirectory import org.gradle.api.tasks.InputFile @@ -53,7 +52,7 @@ class DefaultExecutionPlanParallelTest extends AbstractExecutionPlanSpec { DefaultFinalizedExecutionPlan finalizedPlan def accessHierarchies = new ExecutionNodeAccessHierarchies(CASE_SENSITIVE, Stub(Stat)) - def taskNodeFactory = new TaskNodeFactory(project.gradle, Stub(BuildTreeWorkGraphController), nodeValidator, new TestBuildOperationExecutor(), accessHierarchies, Stub(Problems)) + def taskNodeFactory = new TaskNodeFactory(project.gradle, Stub(BuildTreeWorkGraphController), nodeValidator, new TestBuildOperationExecutor(), accessHierarchies) def setup() { def dependencyResolver = new TaskDependencyResolver([new TaskNodeDependencyResolver(taskNodeFactory)]) diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanTest.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanTest.groovy index 5a8ac921f888..a625d57afb32 100644 --- a/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanTest.groovy +++ b/subprojects/core/src/test/groovy/org/gradle/execution/plan/DefaultExecutionPlanTest.groovy @@ -16,13 +16,11 @@ package org.gradle.execution.plan - import org.gradle.api.BuildCancelledException import org.gradle.api.CircularReferenceException import org.gradle.api.Task import org.gradle.api.internal.TaskInternal import org.gradle.api.internal.tasks.WorkNodeAction -import org.gradle.api.problems.Problems import org.gradle.api.specs.Spec import org.gradle.api.tasks.TaskDependency import org.gradle.composite.internal.BuildTreeWorkGraphController @@ -43,7 +41,7 @@ class DefaultExecutionPlanTest extends AbstractExecutionPlanSpec { DefaultFinalizedExecutionPlan finalizedPlan def accessHierarchies = new ExecutionNodeAccessHierarchies(CASE_SENSITIVE, Stub(Stat)) - def taskNodeFactory = new TaskNodeFactory(thisBuild, Stub(BuildTreeWorkGraphController), nodeValidator, new TestBuildOperationExecutor(), accessHierarchies, Stub(Problems)) + def taskNodeFactory = new TaskNodeFactory(thisBuild, Stub(BuildTreeWorkGraphController), nodeValidator, new TestBuildOperationExecutor(), accessHierarchies) def dependencyResolver = new TaskDependencyResolver([new TaskNodeDependencyResolver(taskNodeFactory)]) def setup() { diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/plan/TaskNodeFactoryTest.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/plan/TaskNodeFactoryTest.groovy index b4896a3bc0f3..227cc1ba0dd7 100644 --- a/subprojects/core/src/test/groovy/org/gradle/execution/plan/TaskNodeFactoryTest.groovy +++ b/subprojects/core/src/test/groovy/org/gradle/execution/plan/TaskNodeFactoryTest.groovy @@ -16,12 +16,10 @@ package org.gradle.execution.plan - import org.gradle.api.internal.GradleInternal import org.gradle.api.internal.TaskInternal import org.gradle.api.internal.plugins.PluginManagerInternal import org.gradle.api.internal.project.ProjectInternal -import org.gradle.api.problems.Problems import org.gradle.composite.internal.BuildTreeWorkGraphController import org.gradle.internal.operations.TestBuildOperationExecutor import spock.lang.Specification @@ -40,7 +38,7 @@ class TaskNodeFactoryTest extends Specification { project.gradle >> gradle project.pluginManager >> Stub(PluginManagerInternal) - factory = new TaskNodeFactory(gradle, Stub(BuildTreeWorkGraphController), Stub(NodeValidator), new TestBuildOperationExecutor(), Stub(ExecutionNodeAccessHierarchies), Stub(Problems)) + factory = new TaskNodeFactory(gradle, Stub(BuildTreeWorkGraphController), Stub(NodeValidator), new TestBuildOperationExecutor(), Stub(ExecutionNodeAccessHierarchies)) } private TaskInternal task(String name) { diff --git a/subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionGraphSpec.groovy b/subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionGraphSpec.groovy index 3b97c3176226..70868fea1551 100644 --- a/subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionGraphSpec.groovy +++ b/subprojects/core/src/test/groovy/org/gradle/execution/taskgraph/DefaultTaskExecutionGraphSpec.groovy @@ -37,7 +37,6 @@ import org.gradle.api.internal.tasks.TaskDependencyInternal import org.gradle.api.internal.tasks.TaskDestroyablesInternal import org.gradle.api.internal.tasks.TaskLocalStateInternal import org.gradle.api.internal.tasks.TaskStateInternal -import org.gradle.api.problems.Problems import org.gradle.api.specs.Spec import org.gradle.composite.internal.BuildTreeWorkGraphController import org.gradle.configuration.internal.TestListenerBuildOperationDecorator @@ -85,7 +84,7 @@ class DefaultTaskExecutionGraphSpec extends AbstractExecutionPlanSpec { def workerLeases = new DefaultWorkerLeaseService(coordinator, parallelismConfiguration) def executorFactory = Mock(ExecutorFactory) def accessHierarchies = new ExecutionNodeAccessHierarchies(CASE_SENSITIVE, Stub(Stat)) - def taskNodeFactory = new TaskNodeFactory(thisBuild, Stub(BuildTreeWorkGraphController), nodeValidator, new TestBuildOperationExecutor(), accessHierarchies, Stub(Problems)) + def taskNodeFactory = new TaskNodeFactory(thisBuild, Stub(BuildTreeWorkGraphController), nodeValidator, new TestBuildOperationExecutor(), accessHierarchies) def dependencyResolver = new TaskDependencyResolver([new TaskNodeDependencyResolver(taskNodeFactory)]) def projectStateRegistry = Stub(ProjectStateRegistry) def executionPlan = newExecutionPlan() diff --git a/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/AbstractProjectBuilderSpec.groovy b/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/AbstractProjectBuilderSpec.groovy index 51610c42bf9a..6f7a5cafe249 100644 --- a/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/AbstractProjectBuilderSpec.groovy +++ b/subprojects/core/src/testFixtures/groovy/org/gradle/test/fixtures/AbstractProjectBuilderSpec.groovy @@ -25,7 +25,6 @@ import org.gradle.api.internal.tasks.TaskExecuter import org.gradle.api.internal.tasks.TaskStateInternal import org.gradle.api.internal.tasks.execution.DefaultTaskExecutionContext import org.gradle.api.internal.tasks.properties.DefaultTaskProperties -import org.gradle.api.problems.Problems import org.gradle.execution.ProjectExecutionServices import org.gradle.execution.plan.LocalTaskNode import org.gradle.internal.execution.BuildOutputCleanupRegistry @@ -87,7 +86,7 @@ abstract class AbstractProjectBuilderSpec extends Specification { } void execute(Task task) { - def workValidationContext = new DefaultWorkValidationContext(WorkValidationContext.TypeOriginInspector.NO_OP, Stub(Problems)) + def workValidationContext = new DefaultWorkValidationContext(WorkValidationContext.TypeOriginInspector.NO_OP) def taskExecutionContext = new DefaultTaskExecutionContext( new LocalTaskNode(task as TaskInternal, workValidationContext, { null }), DefaultTaskProperties.resolve(executionServices.get(PropertyWalker), executionServices.get(FileCollectionFactory), task as TaskInternal),