From ac7aa8d04b5607e73eb4973fcdeb44cf6bdee102 Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Thu, 3 Dec 2020 18:03:55 -0500
Subject: [PATCH] Have consistency

---
 .../cloud/tools/jib/gradle/BaseImageParameters.java    |  3 +--
 .../tools/jib/gradle/ExtensionParametersSpec.java      | 10 +++++-----
 .../google/cloud/tools/jib/gradle/JibExtension.java    |  2 +-
 .../cloud/tools/jib/gradle/PlatformParametersSpec.java |  2 +-
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BaseImageParameters.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BaseImageParameters.java
index ef0abf6531..9077e5b147 100644
--- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BaseImageParameters.java
+++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/BaseImageParameters.java
@@ -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");
diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ExtensionParametersSpec.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ExtensionParametersSpec.java
index 9971e1a6da..b4cbdd04c3 100644
--- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ExtensionParametersSpec.java
+++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ExtensionParametersSpec.java
@@ -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;
   }
 
@@ -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);
   }
diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/JibExtension.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/JibExtension.java
index 993d1c1673..fe7ffb82b2 100644
--- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/JibExtension.java
+++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/JibExtension.java
@@ -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);
 
diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/PlatformParametersSpec.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/PlatformParametersSpec.java
index 681118a0c4..a6de7c1901 100644
--- a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/PlatformParametersSpec.java
+++ b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/PlatformParametersSpec.java
@@ -30,8 +30,8 @@ public class PlatformParametersSpec {
   @Inject
   public PlatformParametersSpec(
       ObjectFactory objectFactory, ListProperty<PlatformParameters> platforms) {
-    this.platforms = platforms;
     this.objectFactory = objectFactory;
+    this.platforms = platforms;
   }
 
   /**