Fix nullability hints

gradle · Oct 13, 2022 · 69fa659 · 69fa659
1 parent 3e38392
commit 69fa659
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...rg/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyConstraintHandler.java b/...rg/gradle/api/internal/artifacts/dsl/dependencies/DefaultDependencyConstraintHandler.java
@@ -189,26 +189,26 @@ private DependencyConstraint doAdd(Configuration configuration, Object dependenc
         return dependency;
     }
 
-    private DependencyConstraint doAddProvider(Configuration configuration, Provider<?> dependencyNotation, Action<? super DependencyConstraint> configureAction) {
+    private DependencyConstraint doAddProvider(Configuration configuration, Provider<?> dependencyNotation, @Nullable Action<? super DependencyConstraint> configureAction) {
         Provider<DependencyConstraint> lazyConstraint = dependencyNotation.map(mapDependencyConstraintProvider(configureAction));
         configuration.getDependencyConstraints().addLater(lazyConstraint);
         // Return a fake dependency constraint object to satisfy Kotlin DSL backwards compatibility
         return DUMMY_CONSTRAINT;
     }
 
-    private DependencyConstraint doAddListProvider(Configuration configuration, Provider<?> dependencyNotation, Action<? super DependencyConstraint>  configureAction) {
+    private DependencyConstraint doAddListProvider(Configuration configuration, Provider<?> dependencyNotation, @Nullable Action<? super DependencyConstraint>  configureAction) {
         // workaround for the fact that mapping to a list will not create a `CollectionProviderInternal`
         ListProperty<DependencyConstraint> constraints = objects.listProperty(DependencyConstraint.class);
         constraints.set(dependencyNotation.map(notation -> {
             List<MinimalExternalModuleDependency> deps = Cast.uncheckedCast(notation);
-            return deps.stream().map(d -> create(d, configureAction)).collect(Collectors.toList());
+            return deps.stream().map(d -> doCreate(d, configureAction)).collect(Collectors.toList());
         }));
         configuration.getDependencyConstraints().addAllLater(constraints);
         return DUMMY_CONSTRAINT;
     }
 
-    private <T> Transformer<DependencyConstraint, T> mapDependencyConstraintProvider(Action<? super DependencyConstraint> configurationAction) {
-        return lazyNotation -> create(lazyNotation, configurationAction);
+    private <T> Transformer<DependencyConstraint, T> mapDependencyConstraintProvider(@Nullable Action<? super DependencyConstraint> configurationAction) {
+        return lazyNotation -> doCreate(lazyNotation, configurationAction);
     }
 
     @Override