AMBARI-2747 - NPE in GSInstaller provider

ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerNoOpProvider.java

@@ -21,11 +21,18 @@ import org.apache.ambari.server.controller.spi.Predicate;
 import org.apache.ambari.server.controller.spi.Request;
 import org.apache.ambari.server.controller.spi.Resource;
 
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
 /**
  * A NO-OP resource provider for a gsInstaller defined cluster.
  */
 public class GSInstallerNoOpProvider extends GSInstallerResourceProvider{
 
+  private final Map<Resource.Type, String> keyPropertyIds = new HashMap<Resource.Type, String>();
+
   // ----- GSInstallerResourceProvider ---------------------------------------
 
   @Override
@@ -37,5 +44,17 @@ public class GSInstallerNoOpProvider extends GSInstallerResourceProvider{
 
   public GSInstallerNoOpProvider(Resource.Type type, ClusterDefinition clusterDefinition) {
     super(type, clusterDefinition);
+    keyPropertyIds.put(type, "id");
+  }
+
+
+  @Override
+  public Map<Resource.Type, String> getKeyPropertyIds() {
+    return keyPropertyIds;
+  }
+
+  @Override
+  public Set<String> checkPropertyIds(Set<String> propertyIds) {
+    return Collections.emptySet();
   }
 }

ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java

@@ -140,8 +140,17 @@ public abstract class GSInstallerResourceProvider implements ResourceProvider {
     return clusterDefinition;
   }
 
+  /**
+   * Get the resource provider type.
+   *
+   * @return the type
+   */
+  public Resource.Type getType() {
+    return type;
+  }
+
 
-  // ----- helper methods ----------------------------------------------------
+// ----- helper methods ----------------------------------------------------
 
   /**
    * Get the set of property ids required to satisfy the given request.

ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerNoOpProviderTest.java

@@ -0,0 +1,27 @@
+package org.apache.ambari.server.controller.gsinstaller;
+
+import junit.framework.Assert;
+import org.apache.ambari.server.controller.spi.Resource;
+import org.junit.Test;
+
+import java.util.Collections;
+
+/**
+ * GSInstallerNoOpProvider tests.
+ */
+public class GSInstallerNoOpProviderTest {
+
+  @Test
+  public void testGetKeyPropertyIds() throws Exception {
+    ClusterDefinition clusterDefinition = new ClusterDefinition(new TestGSInstallerStateProvider());
+    GSInstallerNoOpProvider provider = new GSInstallerNoOpProvider(Resource.Type.Workflow, clusterDefinition);
+    Assert.assertNotNull(provider.getKeyPropertyIds());
+  }
+
+  @Test
+  public void testCheckPropertyIds() throws Exception {
+    ClusterDefinition clusterDefinition = new ClusterDefinition(new TestGSInstallerStateProvider());
+    GSInstallerNoOpProvider provider = new GSInstallerNoOpProvider(Resource.Type.Workflow, clusterDefinition);
+    Assert.assertTrue(provider.checkPropertyIds(Collections.singleton("id")).isEmpty());
+  }
+}