From 08c2ac40064fabcaa04f2213b975c57a9582ccd9 Mon Sep 17 00:00:00 2001
From: Chanseok Oh <chanseok@google.com>
Date: Thu, 3 Aug 2017 09:39:02 -0400
Subject: [PATCH] Change project creation URL (#2221)

* Change project creation URL
* Update URL to set previous page
---
 .../ui/AppEngineDeployPreferencesPanelTest.java       |  7 +++++++
 .../deploy/ui/AppEngineDeployPreferencesPanel.java    | 11 ++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanelTest.java b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanelTest.java
index 9155e188ce..75277adfd1 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanelTest.java
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanelTest.java
@@ -17,6 +17,7 @@
 package com.google.cloud.tools.eclipse.appengine.deploy.ui;
 
 import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
@@ -97,6 +98,12 @@ public void setUp() {
     twoAccountSet = new HashSet<>(Arrays.asList(account1, account2));
   }
 
+  @Test
+  public void testCreateGcpProjectUrl() {
+    assertEquals("https://console.cloud.google.com/projectcreate?previousPage=%2Fprojectselector%2Fappengine%2Fcreate%3Flang%3Djava",
+        AppEngineDeployPreferencesPanel.CREATE_GCP_PROJECT_URL);
+  }
+
   @Test
   public void testAutoSelectSingleAccount() {
     when(loginService.getAccounts()).thenReturn(oneAccountSet);
diff --git a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanel.java b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanel.java
index cd7e6aafea..a5d2cf67f9 100644
--- a/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanel.java
+++ b/plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/AppEngineDeployPreferencesPanel.java
@@ -38,6 +38,7 @@
 import com.google.common.base.Preconditions;
 import com.google.common.base.Predicate;
 import com.google.common.base.Strings;
+import com.google.common.net.UrlEscapers;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -90,8 +91,12 @@ public abstract class AppEngineDeployPreferencesPanel extends DeployPreferencesP
 
   private static final String APPENGINE_VERSIONS_URL =
       "https://console.cloud.google.com/appengine/versions";
-  private static final String CREATE_GCP_PROJECT_WITH_GAE_URL =
-      "https://console.cloud.google.com/projectselector/appengine/create?lang=java";
+  private static final String APP_ENGINE_APPLICATION_CREATE_PATH =
+      "/projectselector/appengine/create?lang=java";
+  @VisibleForTesting
+  static final String CREATE_GCP_PROJECT_URL =
+      "https://console.cloud.google.com/projectcreate?previousPage="
+          + UrlEscapers.urlFormParameterEscaper().escape(APP_ENGINE_APPLICATION_CREATE_PATH);
 
   private static final Logger logger = Logger.getLogger(
       AppEngineDeployPreferencesPanel.class.getName());
@@ -335,7 +340,7 @@ private void createProjectIdSection() {
     Composite linkComposite = new Composite(this, SWT.NONE);
     Link createNewProject = new Link(linkComposite, SWT.WRAP);
     createNewProject.setText(Messages.getString("projectselector.createproject",
-                                                CREATE_GCP_PROJECT_WITH_GAE_URL));
+                                                CREATE_GCP_PROJECT_URL));
     createNewProject.setToolTipText(Messages.getString("projectselector.createproject.tooltip"));
     FontUtil.convertFontToItalic(createNewProject);
     createNewProject.addSelectionListener(