Gradle: EA-140773 - ISE: DefaultGradleExtensions.$$$reportNull$$$

This commit is contained in:
Vladislav.Soroka
2019-04-01 08:17:27 +03:00
parent f2e26105d1
commit 65ca9cf848
@@ -19,6 +19,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
/**
@@ -26,22 +27,23 @@ import java.util.List;
*/
public class DefaultGradleExtensions implements GradleExtensions {
private static final long serialVersionUID = 1L;
private final List<GradleExtension> myExtensions;
private final List<GradleConvention> myConventions;
private final List<GradleProperty> myGradleProperties;
private final List<ExternalTask> myTasks;
private final List<GradleConfiguration> myConfigurations;
private String myParentProjectPath;
@NotNull
private final List<GradleExtension> myExtensions = new ArrayList<GradleExtension>();
@NotNull
private final List<GradleConvention> myConventions = new ArrayList<GradleConvention>();
@NotNull
private final List<GradleProperty> myGradleProperties = new ArrayList<GradleProperty>();
@NotNull
private final List<ExternalTask> myTasks = new ArrayList<ExternalTask>();
private final List<GradleConfiguration> myConfigurations = new ArrayList<GradleConfiguration>();
public DefaultGradleExtensions() {
myExtensions = new ArrayList<GradleExtension>();
myConventions = new ArrayList<GradleConvention>();
myGradleProperties = new ArrayList<GradleProperty>();
myTasks = new ArrayList<ExternalTask>();
myConfigurations = new ArrayList<GradleConfiguration>();
}
public DefaultGradleExtensions(GradleExtensions extensions) {
this();
myParentProjectPath = extensions.getParentProjectPath();
for (GradleExtension extension : extensions.getExtensions()) {
myExtensions.add(new DefaultGradleExtension(extension));
@@ -51,7 +53,7 @@ public class DefaultGradleExtensions implements GradleExtensions {
}
for (GradleProperty property : extensions.getGradleProperties()) {
myGradleProperties.add(new DefaultGradleProperty(property));
}
}
for (ExternalTask entry : extensions.getTasks()) {
myTasks.add(new DefaultExternalTask(entry));
}
@@ -73,30 +75,30 @@ public class DefaultGradleExtensions implements GradleExtensions {
@NotNull
@Override
public List<GradleExtension> getExtensions() {
return myExtensions;
return myExtensions == null ? Collections.<GradleExtension>emptyList() : myExtensions;
}
@Override
@NotNull
public List<GradleConvention> getConventions() {
return myConventions;
return myConventions == null ? Collections.<GradleConvention>emptyList() : myConventions;
}
@NotNull
@Override
public List<GradleProperty> getGradleProperties() {
return myGradleProperties;
return myGradleProperties == null ? Collections.<GradleProperty>emptyList() : myGradleProperties;
}
@NotNull
@Override
public List<ExternalTask> getTasks() {
return myTasks;
return myTasks == null ? Collections.<ExternalTask>emptyList() : myTasks;
}
@NotNull
@Override
public List<GradleConfiguration> getConfigurations() {
return myConfigurations;
return myConfigurations == null ? Collections.<GradleConfiguration>emptyList() : myConfigurations;
}
}