Make ZipappExtension an interface and add some @deprecated annotations

Author: Barry Warsaw

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/extension/PexExtension.java

@@ -15,43 +15,64 @@
  */
 package com.linkedin.gradle.python.extension;
 
+import com.linkedin.gradle.python.util.OperatingSystem;
 import org.gradle.api.Project;
 
 import java.io.File;
 
 
-public class PexExtension extends ZipappExtension {
+public class PexExtension implements ZipappExtension {
+    private File cache;
+    // Default to fat zipapps on Windows, since our wrappers are fairly POSIX specific.
+    private boolean isFat = OperatingSystem.current().isWindows();
     private boolean pythonWrapper = true;
 
     public PexExtension(Project project) {
-        super(new File(project.getBuildDir(), "pex-cache"));
+        this.cache = new File(project.getBuildDir(), "pex-cache");
     }
 
-    // These are kept for API backward compatibility.
-
     public File getPexCache() {
-        return getCache();
+        return cache;
     }
 
-
     public void setPexCache(File pexCache) {
-        super.setCache(pexCache);
+        cache = pexCache;
     }
 
+    // These are kept for API backward compatibility.
+
     /**
      * @return when <code>true</code>, then skinny pex's will be used.
      */
+    @Deprecated
     public boolean isFatPex() {
         return isFat();
     }
 
     /**
      * @param fatPex when <code>true</code>, wrappers will be made all pointing to a single pex file.
      */
+    @Deprecated
     public void setFatPex(boolean fatPex) {
-        super.setIsFat(fatPex);
+        isFat = fatPex;
      }
 
+    // Use these properties instead.
+
+    /**
+     * @return when <code>true</code>, then skinny pex's will be used.
+     */
+    public boolean isFat() {
+        return isFat;
+    }
+
+    /**
+     * @param fat when <code>true</code>, wrappers will be made all pointing to a single pex file.
+     */
+    public void setIsFat(boolean isFat) {
+        this.isFat = isFat;
+    }
+
     /**
      * TODO: Revisit if this is needed.
      *
@@ -64,4 +85,12 @@ public boolean isPythonWrapper() {
     public void setPythonWrapper(boolean pythonWrapper) {
         this.pythonWrapper = pythonWrapper;
     }
+
+    public File getCache() {
+        return cache;
+    }
+
+    public void setCache(File cache) {
+        this.cache = cache;
+    }
 }

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/extension/ZipappExtension.java

@@ -15,39 +15,15 @@
  */
 package com.linkedin.gradle.python.extension;
 
-import com.linkedin.gradle.python.util.OperatingSystem;
-
-import java.io.File;
-
-
-public class ZipappExtension {
-    private File cache;
-    // Default to fat zipapps on Windows, since our wrappers are fairly POSIX specific.
-    private boolean isFat = OperatingSystem.current().isWindows();
-
-    public ZipappExtension(File cache) {
-        this.cache = cache;
-    }
-
-    public File getCache() {
-        return cache;
-    }
-
-    public void setCache(File cache) {
-        this.cache = cache;
-    }
 
+public interface ZipappExtension {
     /**
      * @return when <code>true</code>, then skinny pex's will be used.
      */
-    public boolean isFat() {
-        return isFat;
-    }
+    public boolean isFat();
 
     /**
      * @param fat when <code>true</code>, wrappers will be made all pointing to a single pex file.
      */
-    public void setIsFat(boolean isFat) {
-        this.isFat = isFat;
-    }
+    public void setIsFat(boolean isFat);
 }

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/BuildPexTask.java

@@ -87,7 +87,7 @@ public void buildPex() throws Exception {
 
         deployableExtension.getDeployableBuildDir().mkdirs();
 
-        if (pexExtension.isFatPex()) {
+        if (pexExtension.isFat()) {
             new FatPexGenerator(project, pexOptions).buildEntryPoints();
         } else {
             new ThinPexGenerator(project, pexOptions, templateProvider, additionalProperties).buildEntryPoints();

pygradle-plugin/src/main/groovy/com/linkedin/gradle/python/tasks/BuildWebAppTask.java

@@ -67,7 +67,7 @@ public void buildWebapp() throws IOException, ClassNotFoundException {
         Project project = getProject();
         PexExtension pexExtension = ExtensionUtils.getPythonComponentExtension(project, PexExtension.class);
 
-        if (pexExtension.isFatPex()) {
+        if (pexExtension.isFat()) {
             new FatPexGenerator(project, pexOptions).buildEntryPoint(
                 PexFileUtil.createFatPexFilename(executable.getName()), entryPoint, null);
         } else {