Merge with HEAD

Author: briandealwis

features/com.google.cloud.tools.eclipse.suite.e45.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.google.cloud.tools.eclipse.suite.e45.feature"
       label="Google Cloud Platform for Eclipse 4.5 and later"
-      version="1.0.0.qualifier"
+      version="1.0.1.qualifier"
       provider-name="Google, Inc."
       plugin="com.google.cloud.tools.eclipse.appengine.ui"
       license-feature="com.google.licenses.apache_v2">

features/com.google.cloud.tools.eclipse.suite.e45.feature/pom.xml

@@ -9,7 +9,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>com.google.cloud.tools.eclipse.suite.e45.feature</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>

gcp-repo/metadata.p2.inf

@@ -10,11 +10,11 @@
 
 requires.1.namespace=org.eclipse.equinox.p2.iu
 requires.1.name=com.google.cloud.tools.eclipse.category
-requires.1.range=[1.0.0,1.0.0]
+requires.1.range=[1.0.0,1.0.1]
 requires.1.greedy=true
 
 units.1.id=com.google.cloud.tools.eclipse.category
-units.1.version=1.0.0
+units.1.version=1.0.1
 units.1.properties.1.name=org.eclipse.equinox.p2.type.category
 units.1.properties.1.value=true
 units.1.properties.2.name=org.eclipse.equinox.p2.name
@@ -27,7 +27,7 @@ units.1.properties.5.name=org.eclipse.equinox.p2.doc.url
 units.1.properties.5.value=https://cloud.google.com/eclipse/docs/
 units.1.provides.1.namespace=org.eclipse.equinox.p2.iu
 units.1.provides.1.name=com.google.cloud.tools.eclipse.category
-units.1.provides.1.version=1.0.0
+units.1.provides.1.version=1.0.1
 units.1.copyright =Copyright 2016, 2017 Google Inc.
 units.1.licenses.0 =\
 Cloud Tools for Eclipse is made available under the Apache License, Version 2.0. \

gcp-repo/metadata.product

@@ -4,7 +4,7 @@
   This product exists to (1) bring in any required features, and
   (2) add any additional metadata for the CT4E repository.
 -->
-<product uid="com.google.cloud.tools.eclipse.dist" version="1.0.0.qualifier" useFeatures="true" includeLaunchers="false">
+<product uid="com.google.cloud.tools.eclipse.dist" version="1.0.1.qualifier" useFeatures="true" includeLaunchers="false">
 
    <configIni use="default">
    </configIni>

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui.test/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanelTest.java

@@ -28,7 +28,9 @@
 
 import com.google.api.client.auth.oauth2.Credential;
 import com.google.cloud.tools.eclipse.appengine.deploy.standard.StandardDeployPreferences;
+import com.google.cloud.tools.eclipse.appengine.deploy.ui.StandardDeployPreferencesPanel.ProjectSelectionValidator;
 import com.google.cloud.tools.eclipse.login.IGoogleLoginService;
+import com.google.cloud.tools.eclipse.login.ui.AccountSelector;
 import com.google.cloud.tools.eclipse.login.ui.AccountSelectorObservableValue;
 import com.google.cloud.tools.eclipse.projectselector.ProjectRepository;
 import com.google.cloud.tools.eclipse.projectselector.ProjectRepositoryException;
@@ -65,6 +67,7 @@ public class StandardDeployPreferencesPanelTest {
   private static final String EMAIL_1 = "some-email-1@example.com";
 
   private Composite parent;
+  private StandardDeployPreferencesPanel deployPanel;
   @Mock private IProject project;
   @Mock private IGoogleLoginService loginService;
   @Mock private Runnable layoutChangedHandler;
@@ -87,14 +90,13 @@ public void setUp() throws Exception {
   @Test
   public void testSelectSingleAccount() {
     when(loginService.getAccounts()).thenReturn(new HashSet<>(Arrays.asList(account1)));
-    StandardDeployPreferencesPanel deployPanel = new StandardDeployPreferencesPanel(
-        parent, project, loginService, layoutChangedHandler, true, projectRepository);
+    deployPanel = createPanel(true /* requireValues */);
     assertThat(deployPanel.getSelectedCredential(), is(credential));
 
     // todo? assertTrue(deployPanel.getAccountSelector().isAutoSelectAccountIfNone()
 
     // verify not in error
-    IStatus status = getAccountSelectorValidationStatus(deployPanel);
+    IStatus status = getAccountSelectorValidationStatus();
     assertTrue("account selector is in error: " + status.getMessage(), status.isOK());
 
     assertThat("auto-selected value should be propagated back to model",
@@ -103,10 +105,8 @@ public void testSelectSingleAccount() {
 
   @Test
   public void testValidationMessageWhenNotSignedIn() {
-    StandardDeployPreferencesPanel deployPanel =
-        new StandardDeployPreferencesPanel(parent, project, loginService, layoutChangedHandler,
-                                           true, projectRepository);
-    IStatus status = getAccountSelectorValidationStatus(deployPanel);
+    deployPanel = createPanel(true /* requireValues */);
+    IStatus status = getAccountSelectorValidationStatus();
     assertThat(status.getMessage(), is("Sign in to Google."));
   }
 
@@ -115,34 +115,19 @@ public void testValidationMessageWhenSignedIn() {
     // Return two accounts because the account selector will auto-select if there exists only one.
     when(loginService.getAccounts()).thenReturn(new HashSet<>(Arrays.asList(account1, account2)));
 
-    StandardDeployPreferencesPanel deployPanel =
-        new StandardDeployPreferencesPanel(parent, project, loginService, layoutChangedHandler,
-                                           true, projectRepository);
-    IStatus status = getAccountSelectorValidationStatus(deployPanel);
+    deployPanel = createPanel(true /* requireValues */);
+    IStatus status = getAccountSelectorValidationStatus();
     assertThat(status.getMessage(), is("Select an account."));
   }
 
-  private static Button getButtonWithText(Composite parent, String text) {
-    for (Control control : parent.getChildren()) {
-      if (control instanceof Button) {
-        Button button = (Button) control;
-        if (button.getText().equals(text)) {
-          return button;
-        }
-      }
-    }
-    return null;
-  }
-
   // https://github.com/GoogleCloudPlatform/google-cloud-eclipse/issues/1229
   @Test
   public void testUncheckStopPreviousVersionButtonWhenDisabled() {
-    StandardDeployPreferencesPanel panel = new StandardDeployPreferencesPanel(
-        parent, project, loginService, layoutChangedHandler, true, projectRepository);
+    deployPanel = createPanel(true /* requireValues */);
 
     Button promoteButton =
-        getButtonWithText(panel, "Promote the deployed version to receive all traffic");
-    Button stopButton = getButtonWithText(panel, "Stop previous version");
+        getButtonWithText("Promote the deployed version to receive all traffic");
+    Button stopButton = getButtonWithText("Stop previous version");
     SWTBotCheckBox promote = new SWTBotCheckBox(promoteButton);
     SWTBotCheckBox stop = new SWTBotCheckBox(stopButton);
 
@@ -183,11 +168,9 @@ public void testProjectSavedInPreferencesSelected() throws ProjectRepositoryExce
         new ProjectScope(project).getNode(StandardDeployPreferences.PREFERENCE_STORE_QUALIFIER);
     node.put("project.id", "projectId1");
     node.put("account.email", EMAIL_1);
-    initializeProjectRepository(projectRepository);
+    initializeProjectRepository();
     when(loginService.getAccounts()).thenReturn(new HashSet<>(Arrays.asList(account1, account2)));
-    StandardDeployPreferencesPanel deployPanel =
-        new StandardDeployPreferencesPanel(parent, project, loginService, layoutChangedHandler,
-                                           true, projectRepository);
+    deployPanel = createPanel(true /* requireValues */);
     Queue<Control> children = new ArrayDeque<>(Arrays.asList(deployPanel.getChildren()));
     while (!children.isEmpty()) {
       Control control = children.poll();
@@ -204,7 +187,65 @@ public void testProjectSavedInPreferencesSelected() throws ProjectRepositoryExce
     fail("Did not find ProjectSelector widget");
   }
 
-  private void initializeProjectRepository(ProjectRepository projectRepository)
+  @Test
+  public void testProjectNotSelectedIsAnErrorWhenRequireValuesIsTrue() {
+    deployPanel = createPanel(true /* requireValues */);
+    assertThat(getProjectSelectionValidator().getSeverity(), is(IStatus.ERROR));
+  }
+
+  @Test
+  public void testProjectNotSelectedIsNotAnErrorWhenRequireValuesIsFalse() {
+    deployPanel = createPanel(false /* requireValues */);
+    assertThat(getProjectSelectionValidator().getSeverity(), is(IStatus.INFO));
+  }
+
+  @Test
+  public void testProjectsExistThenNoProjectNotFoundError() throws ProjectRepositoryException {
+    when(loginService.getAccounts()).thenReturn(new HashSet<>(Arrays.asList(account1)));
+    initializeProjectRepository();
+    deployPanel = createPanel(false /* requireValues */);
+    selectAccount(account1);
+    assertThat(getProjectSelectionValidator().getSeverity(), is(IStatus.OK));
+  }
+
+  private Button getButtonWithText(String text) {
+    for (Control control : deployPanel.getChildren()) {
+      if (control instanceof Button) {
+        Button button = (Button) control;
+        if (button.getText().equals(text)) {
+          return button;
+        }
+      }
+    }
+    return null;
+  }
+
+  private void selectAccount(Account account) {
+    for (Control control : deployPanel.getChildren()) {
+      if (control instanceof AccountSelector) {
+        AccountSelector accountSelector = (AccountSelector) control;
+        accountSelector.selectAccount(account.getEmail());
+      }
+    }
+  }
+
+  private StandardDeployPreferencesPanel createPanel(boolean requireValues) {
+    return new StandardDeployPreferencesPanel(parent, project, loginService, layoutChangedHandler,
+                                              requireValues, projectRepository);
+  }
+
+  private IStatus getProjectSelectionValidator() {
+    for (Object object : deployPanel.getDataBindingContext().getValidationStatusProviders()) {
+      if (object instanceof ProjectSelectionValidator) {
+        ProjectSelectionValidator projectSelectionValidator = (ProjectSelectionValidator) object;
+        return (IStatus) projectSelectionValidator.getValidationStatus().getValue();
+      }
+    }
+    fail("Could not find ProjectSelectionValidator.");
+    return null;
+  }
+
+  private void initializeProjectRepository()
       throws ProjectRepositoryException {
     GcpProject project1 = new GcpProject("Project1", "projectId1");
     GcpProject project2 = new GcpProject("Project2", "projectId2");
@@ -216,7 +257,7 @@ private void initializeProjectRepository(ProjectRepository projectRepository)
         .thenReturn(project2);
   }
 
-  private IStatus getAccountSelectorValidationStatus(StandardDeployPreferencesPanel deployPanel) {
+  private IStatus getAccountSelectorValidationStatus() {
     IStatus status = null;
     for (Object object : deployPanel.getDataBindingContext().getValidationStatusProviders()) {
       ValidationStatusProvider statusProvider = (ValidationStatusProvider) object;

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/DeployPropertyPage.java

@@ -47,7 +47,7 @@
 public class DeployPropertyPage extends PropertyPage {
 
   private DeployPreferencesPanel content;
-  private boolean canSetMessage;
+  private boolean canSetMessage = true;
   private boolean isStandardPanel;
   private IFacetedProject facetedProject = null;
   private String invalidFacetConfigErrorMessage = "";
@@ -202,7 +202,7 @@ private void evaluateFacetConfiguration() {
   private void updatePageBasedOnFacetConfig(boolean hasCorrectFacetConfiguration) {
     if (hasCorrectFacetConfiguration) {
       canSetMessage = true;
-      setErrorMessage(null);
+      content.getDataBindingContext().updateModels();
     } else {
       setErrorMessage(invalidFacetConfigErrorMessage);
       canSetMessage = false;

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/StandardDeployPreferencesPanel.java

@@ -27,7 +27,6 @@
 import com.google.cloud.tools.eclipse.projectselector.model.GcpProject;
 import com.google.cloud.tools.eclipse.ui.util.FontUtil;
 import com.google.cloud.tools.eclipse.ui.util.databinding.BucketNameValidator;
-import com.google.cloud.tools.eclipse.ui.util.databinding.ProjectSelectorValidator;
 import com.google.cloud.tools.eclipse.ui.util.databinding.ProjectVersionValidator;
 import com.google.cloud.tools.eclipse.ui.util.event.OpenUriSelectionListener;
 import com.google.cloud.tools.eclipse.ui.util.event.OpenUriSelectionListener.ErrorDialogErrorHandler;
@@ -36,6 +35,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.logging.Level;
@@ -51,7 +51,6 @@
 import org.eclipse.core.databinding.observable.value.ComputedValue;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
 import org.eclipse.core.databinding.observable.value.WritableValue;
-import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.databinding.validation.MultiValidator;
 import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.resources.IProject;
@@ -156,7 +155,7 @@ private void setupDataBinding() {
     bindingContext = new DataBindingContext();
 
     setupAccountEmailDataBinding(bindingContext);
-    setupProjectIdDataBinding(bindingContext);
+    setupProjectSelectorDataBinding(bindingContext);
     setupProjectVersionDataBinding(bindingContext);
     setupAutoPromoteDataBinding(bindingContext);
     setupBucketDataBinding(bindingContext);
@@ -198,7 +197,14 @@ public Object convert(Object expectedEmail) {
         accountSelectorObservableValue));
   }
 
-  private void setupProjectIdDataBinding(DataBindingContext context) {
+  private void setupProjectSelectorDataBinding(DataBindingContext context) {
+    IViewerObservableValue projectInput =
+        ViewerProperties.input().observe(projectSelector.getViewer());
+    IViewerObservableValue projectSelection =
+        ViewerProperties.singleSelection().observe(projectSelector.getViewer());
+    context.addValidationStatusProvider(
+        new ProjectSelectionValidator(projectInput, projectSelection, requireValues));
+
     IViewerObservableValue projectList =
         ViewerProperties.singleSelection().observe(projectSelector.getViewer());
     IObservableValue projectIdModel = PojoProperties.value("projectId").observe(model);
@@ -207,11 +213,6 @@ private void setupProjectIdDataBinding(DataBindingContext context) {
         new UpdateValueStrategy().setConverter(new GcpProjectToProjectIdConverter());
     UpdateValueStrategy projectIdToGcpProject =
         new UpdateValueStrategy().setConverter(new ProjectIdToGcpProjectConverter());
-    if (requireValues) {
-      IValidator validator = new ProjectSelectorValidator();
-      gcpProjectToProjectId.setAfterConvertValidator(validator);
-      projectIdToGcpProject.setAfterGetValidator(validator);
-    }
 
     context.bindValue(projectList, projectIdModel, gcpProjectToProjectId, projectIdToGcpProject);
   }
@@ -523,6 +524,42 @@ public Object convert(Object fromObject) {
     }
   }
 
+  static class ProjectSelectionValidator extends FixedMultiValidator {
+
+    private final IViewerObservableValue projectInput;
+    private final IViewerObservableValue projectSelection;
+    private final boolean requireValues;
+
+    private ProjectSelectionValidator(IViewerObservableValue projectInput,
+                                      IViewerObservableValue projectSelection,
+                                      boolean requireValues) {
+      this.projectInput = projectInput;
+      this.projectSelection = projectSelection;
+      this.requireValues = requireValues;
+    }
+
+    @Override
+    protected IStatus validate() {
+      // this access is recorded and ensures that changes are tracked, don't move it inside the if
+      Collection<?> projects = (Collection<?>) projectInput.getValue();
+      // this access is recorded and ensures that changes are tracked, don't move it inside the if
+      Object selectedProject = projectSelection.getValue();
+      if (projects.isEmpty()) {
+        if (requireValues) {
+          return ValidationStatus.error(Messages.getString("projectselector.no.projects")); //$NON-NLS-1$
+        } else {
+          return ValidationStatus.info(Messages.getString("projectselector.no.projects")); //$NON-NLS-1$
+        }
+      }
+      if (requireValues) {
+        if (selectedProject == null) {
+          return ValidationStatus.error(Messages.getString("projectselector.project.not.selected")); //$NON-NLS-1$
+        }
+      }
+      return ValidationStatus.ok();
+    }
+  }
+
   /**
    * Validates the {@link AccountSelector account selector} state against the panel settings.
    * Reports an error if the panel requires all values to be set, but the account selector does not

plugins/com.google.cloud.tools.eclipse.appengine.deploy.ui/src/com/google/cloud/tools/eclipse/appengine/deploy/ui/messages.properties

@@ -42,10 +42,12 @@ tooltip.staging.bucket=The Google Cloud Storage bucket used to stage files for d
  If not specified, the application''s default code bucket is used.
 
 #Project selector
-projectselector.selectProject=Select a Google Cloud Platform project
 projectselector.createproject=Create a project in the <a href="{0}">Cloud Console</a>. Then refresh this list.
 projectselector.createproject.tooltip=Opens the Cloud Console in a browser. You will need to refresh the project list \
 after the project is created.
+projectselector.no.projects=No projects found
+projectselector.project.not.selected=Select a project
+projectselector.selectProject=Select a Google Cloud Platform project
 projectselector.retrieveproject.error.title=Failed to retrieve projects
 projectselector.retrieveproject.error.message=An error occurred while retrieving projects: {0}
 projectselector.retrieveapplication.error.title=Failed to retrieve App Engine application