Fix to/from closure type in JibExtension (#1061)

* Fix to/from closure type in JibExtension * Remove interface
GoogleContainerTools · Oct 8, 2018 · 4a4a477 · 4a4a477
1 parent 09844e9
commit 4a4a477
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 71 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
@@ -20,9 +20,12 @@
 import javax.inject.Inject;
 import org.gradle.api.Action;
 import org.gradle.api.model.ObjectFactory;
+import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Nested;
+import org.gradle.api.tasks.Optional;
 
-/** {@link ImageParameters} that configure the base image. */
-public class BaseImageParameters implements ImageParameters {
+/** Object in {@link JibExtension} that configures the base image. */
+public class BaseImageParameters {
 
   private final AuthParameters auth;
 
@@ -34,34 +37,34 @@ public BaseImageParameters(ObjectFactory objectFactory, String imageDescriptor)
     auth = objectFactory.newInstance(AuthParameters.class, imageDescriptor + ".auth");
   }
 
+  @Input
   @Nullable
-  @Override
+  @Optional
   public String getImage() {
     return image;
   }
 
-  @Override
   public void setImage(String image) {
     this.image = image;
   }
 
+  @Input
   @Nullable
-  @Override
+  @Optional
   public String getCredHelper() {
     return credHelper;
   }
 
-  @Override
   public void setCredHelper(String credHelper) {
     this.credHelper = credHelper;
   }
 
-  @Override
+  @Nested
+  @Optional
   public AuthParameters getAuth() {
     return auth;
   }
 
-  @Override
   public void auth(Action<? super AuthParameters> action) {
     action.execute(auth);
   }

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ImageParameters.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/ImageParameters.java
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
@@ -151,11 +151,11 @@ void handleDeprecatedParameters(JibLogger logger) {
     }
   }
 
-  public void from(Action<? super ImageParameters> action) {
+  public void from(Action<? super BaseImageParameters> action) {
     action.execute(from);
   }
 
-  public void to(Action<? super ImageParameters> action) {
+  public void to(Action<? super TargetImageParameters> action) {
     action.execute(to);
   }
 

diff --git a/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TargetImageParameters.java b/jib-gradle-plugin/src/main/java/com/google/cloud/tools/jib/gradle/TargetImageParameters.java
@@ -23,10 +23,11 @@
 import org.gradle.api.Action;
 import org.gradle.api.model.ObjectFactory;
 import org.gradle.api.tasks.Input;
+import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.Optional;
 
-/** {@link ImageParameters} that configure the target image. */
-public class TargetImageParameters implements ImageParameters {
+/** Object in {@link JibExtension} that configures the target image. */
+public class TargetImageParameters {
 
   private final AuthParameters auth;
 
@@ -39,13 +40,13 @@ public TargetImageParameters(ObjectFactory objectFactory, String imageDescriptor
     auth = objectFactory.newInstance(AuthParameters.class, imageDescriptor + ".auth");
   }
 
+  @Input
   @Nullable
-  @Override
+  @Optional
   public String getImage() {
     return image;
   }
 
-  @Override
   public void setImage(String image) {
     this.image = image;
   }
@@ -60,23 +61,23 @@ public void setTags(Set<String> tags) {
     this.tags = tags;
   }
 
+  @Input
   @Nullable
-  @Override
+  @Optional
   public String getCredHelper() {
     return credHelper;
   }
 
-  @Override
   public void setCredHelper(String credHelper) {
     this.credHelper = credHelper;
   }
 
-  @Override
+  @Nested
+  @Optional
   public AuthParameters getAuth() {
     return auth;
   }
 
-  @Override
   public void auth(Action<? super AuthParameters> action) {
     action.execute(auth);
   }