Convert to static extension building

src/main/java/com/google/cloud/tools/gradle/appengine/core/AppEngineExtension.java → src/main/java/com/google/cloud/tools/gradle/appengine/core/AppEngineCoreExtensionProperties.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Google Inc. All Right Reserved.
+ * Copyright (c) 2018 Google Inc. All Right Reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 
 package com.google.cloud.tools.gradle.appengine.core;
 
-/** Base Extension class for all our appengine extensions to include themselves into. */
-public class AppEngineExtension {
-  // dynamically fill this in in AppEngineCorePlugin
+public interface AppEngineCoreExtensionProperties {
+  ToolsExtension getTools();
+
+  DeployExtension getDeploy();
 }

src/main/java/com/google/cloud/tools/gradle/appengine/core/AppEngineCorePlugin.java → src/main/java/com/google/cloud/tools/gradle/appengine/core/AppEngineCorePluginConfiguration.java

@@ -19,17 +19,14 @@
 
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
-import org.gradle.api.Plugin;
 import org.gradle.api.Project;
-import org.gradle.api.Task;
-import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.util.GradleVersion;
 
 /**
  * Core plugin for App Engine, contains common tasks like deploy and show configuration Also
  * instantiates the "tools" extension to specify the cloud sdk path.
  */
-public class AppEngineCorePlugin implements Plugin<Project> {
+public class AppEngineCorePluginConfiguration {
 
   public static final GradleVersion GRADLE_MIN_VERSION = GradleVersion.version("3.4.1");
 
@@ -45,21 +42,25 @@ public class AppEngineCorePlugin implements Plugin<Project> {
   public static final String SHOW_CONFIG_TASK_NAME = "appengineShowConfiguration";
 
   public static final String APPENGINE_EXTENSION = "appengine";
-  public static final String DEPLOY_EXTENSION = "deploy";
-  public static final String TOOLS_EXTENSION = "tools";
 
   private Project project;
-  private AppEngineExtension extension;
   private DeployExtension deployExtension;
   private ToolsExtension toolsExtension;
   private CloudSdkBuilderFactory cloudSdkBuilderFactory;
+  private String taskGroup;
 
-  @Override
-  public void apply(Project project) {
+  /** Configure core tasks for appengine flexible and standard project plugins. */
+  public void configureCoreProperties(
+      Project project,
+      AppEngineCoreExtensionProperties appEngineCoreExtensionProperties,
+      String taskGroup) {
     checkGradleVersion(project);
 
     this.project = project;
-    createExtensions();
+    this.taskGroup = taskGroup;
+    this.toolsExtension = appEngineCoreExtensionProperties.getTools();
+    this.deployExtension = appEngineCoreExtensionProperties.getDeploy();
+    configureCloudSdkBuilderFactory();
 
     createDeployTask();
     createDeployCronTask();
@@ -70,17 +71,7 @@ public void apply(Project project) {
     createShowConfigurationTask();
   }
 
-  private void createExtensions() {
-    extension = project.getExtensions().create(APPENGINE_EXTENSION, AppEngineExtension.class);
-    deployExtension =
-        ((ExtensionAware) extension)
-            .getExtensions()
-            .create(DEPLOY_EXTENSION, DeployExtension.class, project);
-    toolsExtension =
-        ((ExtensionAware) extension)
-            .getExtensions()
-            .create(TOOLS_EXTENSION, ToolsExtension.class, project);
-
+  private void configureCloudSdkBuilderFactory() {
     project.afterEvaluate(
         new Action<Project>() {
           @Override
@@ -100,7 +91,7 @@ private void createDeployTask() {
             new Action<DeployTask>() {
               @Override
               public void execute(final DeployTask deployTask) {
-                deployTask.setGroup(APP_ENGINE_TASK_GROUP);
+                deployTask.setGroup(taskGroup);
                 deployTask.setDescription("Deploy an App Engine application");
 
                 project.afterEvaluate(
@@ -124,7 +115,7 @@ private void createDeployCronTask() {
             new Action<DeployCronTask>() {
               @Override
               public void execute(final DeployCronTask deployTask) {
-                deployTask.setGroup(APP_ENGINE_TASK_GROUP);
+                deployTask.setGroup(taskGroup);
                 deployTask.setDescription("Deploy Cron configuration");
 
                 project.afterEvaluate(
@@ -148,7 +139,7 @@ private void createDeployDispatchTask() {
             new Action<DeployDispatchTask>() {
               @Override
               public void execute(final DeployDispatchTask deployTask) {
-                deployTask.setGroup(APP_ENGINE_TASK_GROUP);
+                deployTask.setGroup(taskGroup);
                 deployTask.setDescription("Deploy Dispatch configuration");
 
                 project.afterEvaluate(
@@ -172,7 +163,7 @@ private void createDeployDosTask() {
             new Action<DeployDosTask>() {
               @Override
               public void execute(final DeployDosTask deployTask) {
-                deployTask.setGroup(APP_ENGINE_TASK_GROUP);
+                deployTask.setGroup(taskGroup);
                 deployTask.setDescription("Deploy Dos configuration");
 
                 project.afterEvaluate(
@@ -196,7 +187,7 @@ private void createDeployIndexTask() {
             new Action<DeployIndexTask>() {
               @Override
               public void execute(final DeployIndexTask deployTask) {
-                deployTask.setGroup(APP_ENGINE_TASK_GROUP);
+                deployTask.setGroup(taskGroup);
                 deployTask.setDescription("Deploy Index configuration");
 
                 project.afterEvaluate(
@@ -220,7 +211,7 @@ private void createDeployQueueTask() {
             new Action<DeployQueueTask>() {
               @Override
               public void execute(final DeployQueueTask deployTask) {
-                deployTask.setGroup(APP_ENGINE_TASK_GROUP);
+                deployTask.setGroup(taskGroup);
                 deployTask.setDescription("Deploy Queue configuration");
 
                 project.afterEvaluate(
@@ -244,7 +235,7 @@ private void createShowConfigurationTask() {
             new Action<ShowConfigurationTask>() {
               @Override
               public void execute(final ShowConfigurationTask showConfigurationTask) {
-                showConfigurationTask.setGroup(APP_ENGINE_TASK_GROUP);
+                showConfigurationTask.setGroup(taskGroup);
                 showConfigurationTask.setDescription(
                     "Show current App Engine plugin configuration");
 
@@ -253,23 +244,6 @@ public void execute(final ShowConfigurationTask showConfigurationTask) {
             });
   }
 
-  /** Override the default task group of tasks from this plugin. */
-  public static void overrideCoreTasksGroup(Project project, final String overrideGroup) {
-    project
-        .getTasks()
-        .all(
-            new Action<Task>() {
-              @Override
-              public void execute(Task task) {
-                String oldGroup = task.getGroup();
-                if (oldGroup != null
-                    && oldGroup.equals(AppEngineCorePlugin.APP_ENGINE_TASK_GROUP)) {
-                  task.setGroup(overrideGroup);
-                }
-              }
-            });
-  }
-
   private void checkGradleVersion(Project project) {
     if (GRADLE_MIN_VERSION.compareTo(GradleVersion.current()) > 0) {
       throw new GradleException(

src/main/java/com/google/cloud/tools/gradle/appengine/core/DeployExtension.java

@@ -22,6 +22,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import javax.inject.Inject;
 import org.gradle.api.Project;
 
 /** Extension element to define Deployable configurations for App Engine. */
@@ -41,6 +42,7 @@ public class DeployExtension
   private String version;
   private File appEngineDirectory;
 
+  @Inject
   public DeployExtension(Project gradleProject) {
     this.gradleProject = gradleProject;
   }

src/main/java/com/google/cloud/tools/gradle/appengine/core/ShowConfigurationTask.java

@@ -36,6 +36,7 @@
 public class ShowConfigurationTask extends DefaultTask {
 
   private String extensionId;
+  private String allowedNestedPackageSearchPath;
 
   @Input
   public String getExtensionId() {

src/main/java/com/google/cloud/tools/gradle/appengine/core/ToolsExtension.java

@@ -18,6 +18,7 @@
 package com.google.cloud.tools.gradle.appengine.core;
 
 import java.io.File;
+import javax.inject.Inject;
 import org.gradle.api.Project;
 
 /** Extension element to define the location of cloud sdk tooling. */
@@ -27,6 +28,7 @@ public class ToolsExtension {
 
   private File cloudSdkHome;
 
+  @Inject
   public ToolsExtension(Project project) {
     this.project = project;
   }

src/main/java/com/google/cloud/tools/gradle/appengine/flexible/AppEngineFlexibleExtension.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2018 Google Inc. All Right Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package com.google.cloud.tools.gradle.appengine.flexible;
+
+import com.google.cloud.tools.gradle.appengine.core.AppEngineCoreExtensionProperties;
+import com.google.cloud.tools.gradle.appengine.core.DeployExtension;
+import com.google.cloud.tools.gradle.appengine.core.ToolsExtension;
+import org.gradle.api.Action;
+import org.gradle.api.Project;
+import org.gradle.api.plugins.ExtensionAware;
+
+public class AppEngineFlexibleExtension implements AppEngineCoreExtensionProperties {
+  private ToolsExtension tools;
+  private DeployExtension deploy;
+  private StageFlexibleExtension stage;
+
+  /** Create nested configuration blocks as Extensions. */
+  public void createSubExtensions(Project project) {
+    tools = ((ExtensionAware) this).getExtensions().create("tools", ToolsExtension.class, project);
+    deploy =
+        ((ExtensionAware) this).getExtensions().create("deploy", DeployExtension.class, project);
+    stage =
+        ((ExtensionAware) this)
+            .getExtensions()
+            .create("stage", StageFlexibleExtension.class, project);
+  }
+
+  public void tools(Action<? super ToolsExtension> action) {
+    action.execute(tools);
+  }
+
+  public void deploy(Action<? super DeployExtension> action) {
+    action.execute(deploy);
+  }
+
+  public void stage(Action<? super StageFlexibleExtension> action) {
+    action.execute(stage);
+  }
+
+  @Override
+  public ToolsExtension getTools() {
+    return tools;
+  }
+
+  @Override
+  public DeployExtension getDeploy() {
+    return deploy;
+  }
+
+  public StageFlexibleExtension getStage() {
+    return stage;
+  }
+}

src/main/java/com/google/cloud/tools/gradle/appengine/flexible/AppEngineFlexiblePlugin.java

@@ -17,16 +17,14 @@
 
 package com.google.cloud.tools.gradle.appengine.flexible;
 
-import com.google.cloud.tools.gradle.appengine.core.AppEngineCorePlugin;
+import com.google.cloud.tools.gradle.appengine.core.AppEngineCorePluginConfiguration;
 import com.google.cloud.tools.gradle.appengine.core.DeployExtension;
-import com.google.cloud.tools.gradle.appengine.util.ExtensionUtil;
 import java.io.File;
 import org.gradle.api.Action;
 import org.gradle.api.GradleException;
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.plugins.BasePlugin;
-import org.gradle.api.plugins.ExtensionAware;
 import org.gradle.api.plugins.JavaPlugin;
 import org.gradle.api.plugins.WarPlugin;
 import org.gradle.api.tasks.bundling.Jar;
@@ -42,27 +40,27 @@ public class AppEngineFlexiblePlugin implements Plugin<Project> {
   public static final String STAGE_EXTENSION = "stage";
 
   private Project project;
+  private AppEngineFlexibleExtension appengineExtension;
   private StageFlexibleExtension stageExtension;
 
   @Override
   public void apply(Project project) {
     this.project = project;
-    project.getPluginManager().apply(AppEngineCorePlugin.class);
+    appengineExtension =
+        project.getExtensions().create("appengine", AppEngineFlexibleExtension.class);
+    appengineExtension.createSubExtensions(project);
+
+    new AppEngineCorePluginConfiguration()
+        .configureCoreProperties(project, appengineExtension, APP_ENGINE_FLEXIBLE_TASK_GROUP);
 
     configureExtensions();
     createStageTask();
-
-    AppEngineCorePlugin.overrideCoreTasksGroup(project, APP_ENGINE_FLEXIBLE_TASK_GROUP);
   }
 
   private void configureExtensions() {
-    // obtain extensions defined by core plugin.
-    ExtensionAware appengine =
-        new ExtensionUtil(project).get(AppEngineCorePlugin.APPENGINE_EXTENSION);
 
     // create the flexible stage extension and set defaults.
-    stageExtension =
-        appengine.getExtensions().create(STAGE_EXTENSION, StageFlexibleExtension.class, project);
+    stageExtension = appengineExtension.getStage();
     File defaultStagedAppDir = new File(project.getBuildDir(), STAGED_APP_DIR_NAME);
     stageExtension.setStagingDirectory(defaultStagedAppDir);
     stageExtension.setAppEngineDirectory(new File(project.getProjectDir(), "src/main/appengine"));
@@ -73,7 +71,7 @@ private void configureExtensions() {
     }
 
     // obtain deploy extension set defaults
-    DeployExtension deploy = new ExtensionUtil(appengine).get(AppEngineCorePlugin.DEPLOY_EXTENSION);
+    DeployExtension deploy = appengineExtension.getDeploy();
     deploy.setDeployables(new File(defaultStagedAppDir, "app.yaml"));
     // grab default project configuration from staging default
     deploy.setAppEngineDirectory(stageExtension.getAppEngineDirectory());
@@ -122,6 +120,9 @@ public void execute(Project project) {
                         });
                   }
                 });
-    project.getTasks().getByName(AppEngineCorePlugin.DEPLOY_TASK_NAME).dependsOn(stageTask);
+    project
+        .getTasks()
+        .getByName(AppEngineCorePluginConfiguration.DEPLOY_TASK_NAME)
+        .dependsOn(stageTask);
   }
 }

src/main/java/com/google/cloud/tools/gradle/appengine/sourcecontext/SourceContextPlugin.java

@@ -17,7 +17,7 @@
 
 package com.google.cloud.tools.gradle.appengine.sourcecontext;
 
-import com.google.cloud.tools.gradle.appengine.core.AppEngineCorePlugin;
+import com.google.cloud.tools.gradle.appengine.core.AppEngineCoreExtensionProperties;
 import com.google.cloud.tools.gradle.appengine.core.CloudSdkBuilderFactory;
 import com.google.cloud.tools.gradle.appengine.core.ToolsExtension;
 import com.google.cloud.tools.gradle.appengine.util.ExtensionUtil;
@@ -50,10 +50,8 @@ public void apply(Project project) {
 
   private void createExtension() {
     // obtain extensions defined by core plugin.
-    ExtensionAware appengine =
-        new ExtensionUtil(project).get(AppEngineCorePlugin.APPENGINE_EXTENSION);
-    final ToolsExtension tools =
-        new ExtensionUtil(appengine).get(AppEngineCorePlugin.TOOLS_EXTENSION);
+    ExtensionAware appengine = new ExtensionUtil(project).get("appengine");
+    final ToolsExtension tools = ((AppEngineCoreExtensionProperties) appengine).getTools();
 
     // create source context extension and set defaults
     extension =