Skip to content

Have consistency in instantiating Gradle parameter classes #2915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chanseokoh merged 1 commit into from
Dec 4, 2020
Merged

Have consistency in instantiating Gradle parameter classes #2915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BaseImageParameters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ public BaseImageParameters(ObjectFactory objectFactory) {
auth = objectFactory.newInstance(AuthParameters.class, "from.auth");
platforms = objectFactory.listProperty(PlatformParameters.class);
image = objectFactory.property(String.class);
platformParametersSpec =
objectFactory.newInstance(PlatformParametersSpec.class, objectFactory, platforms);
platformParametersSpec = objectFactory.newInstance(PlatformParametersSpec.class, platforms);

PlatformParameters amd64Linux = new PlatformParameters();
amd64Linux.setArchitecture("amd64");
Expand Down
10 changes: 5 additions & 5 deletions ...radle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ExtensionParametersSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@

import javax.inject.Inject;
import org.gradle.api.Action;
import org.gradle.api.Project;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.provider.ListProperty;

/** Allows to add {@link ExtensionParameters} objects to the list property of the same type. */
public class ExtensionParametersSpec {

private final Project project;
private final ObjectFactory objectFactory;
private final ListProperty<ExtensionParameters> pluginExtensions;

@Inject
public ExtensionParametersSpec(
Project project, ListProperty<ExtensionParameters> pluginExtensions) {
this.project = project;
ObjectFactory objectFactory, ListProperty<ExtensionParameters> pluginExtensions) {
this.objectFactory = objectFactory;
this.pluginExtensions = pluginExtensions;
}

Expand All @@ -40,7 +40,7 @@ public ExtensionParametersSpec(
* @param action closure representing an extension configuration
*/
public void pluginExtension(Action<? super ExtensionParameters> action) {
ExtensionParameters extension = project.getObjects().newInstance(ExtensionParameters.class);
ExtensionParameters extension = objectFactory.newInstance(ExtensionParameters.class);
action.execute(extension);
pluginExtensions.add(extension);
}
Expand Down
2 changes: 1 addition & 1 deletion jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/JibExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public JibExtension(Project project) {

pluginExtensions = objectFactory.listProperty(ExtensionParameters.class).empty();
extensionParametersSpec =
objectFactory.newInstance(ExtensionParametersSpec.class, project, pluginExtensions);
objectFactory.newInstance(ExtensionParametersSpec.class, pluginExtensions);
allowInsecureRegistries = objectFactory.property(Boolean.class);
containerizingMode = objectFactory.property(String.class);

Expand Down
2 changes: 1 addition & 1 deletion ...gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/PlatformParametersSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ public class PlatformParametersSpec {
@Inject
public PlatformParametersSpec(
ObjectFactory objectFactory, ListProperty<PlatformParameters> platforms) {
this.platforms = platforms;
this.objectFactory = objectFactory;
this.platforms = platforms;
}

/**
Expand Down