Merge pull request gradle#27194 Remove unused problem variables

<!--- The issue this PR addresses -->
Fixes
 - gradle#27193

Co-authored-by: Reinhold Degenfellner <rdegenfellner@gradle.com>

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
         )
     }
 }

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);
     }
 

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<String> 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)) }
     }

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<String> actualErrors = validationContext.problems
             .collect({ (normaliseLineSeparators(TypeValidationProblemRenderer.renderMinimalInformationAbout(it)) + (it.severity == Severity.ERROR ? " [STRICT]" : "") as String) })

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
         )

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<? super ExecutionRequestContext, ? extends Result> executeStep;
 
-    public DefaultExecutionEngine(Problems problems, DeferredExecutionAwareStep<? super ExecutionRequestContext, ? extends Result> executeStep) {
-        this.problems = problems;
+    public DefaultExecutionEngine(DeferredExecutionAwareStep<? super ExecutionRequestContext, ? extends Result> 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);
             }
 

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<Class<?>> types = new HashSet<>();
     private final ImmutableList.Builder<ReportableProblem> 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;
     }
 

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<BeforeExecutionContext> 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
     }
 

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<>(

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) {

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,15 +483,14 @@ ExecutionEngine createExecutionEngine(
         ListenerManager listenerManager,
         ImmutableWorkspaceMetadataStore immutableWorkspaceMetadataStore,
         OutputSnapshotter outputSnapshotter,
-        Problems problems,
         TimeoutHandler timeoutHandler,
         ValidateStep.ValidationWarningRecorder validationWarningRecorder,
         VirtualFileSystem virtualFileSystem
     ) {
         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,

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,15 +292,14 @@ 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,
         Hasher hasher,
         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<Isolat
         private final BuildOperationExecutor buildOperationExecutor;
         private final ClassLoaderHierarchyHasher classLoaderHierarchyHasher;
         private final FileCollectionFactory fileCollectionFactory;
-        private final Problems problems;
         private final boolean cacheable;
         private final Class<?> 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,

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<? extends TransformAction<?>> 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));
     }