AMBARI-7418 - Views: cannot create instance w/o a restart.

ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java

@@ -22,9 +22,7 @@ import org.apache.ambari.server.controller.spi.PropertyProvider;
 import org.apache.ambari.server.controller.spi.ProviderModule;
 import org.apache.ambari.server.controller.spi.Resource;
 import org.apache.ambari.server.controller.spi.ResourceProvider;
-import org.apache.ambari.server.orm.entities.ViewEntity;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,11 +32,6 @@ import java.util.Map;
  * any resource types not defined in a view.
  */
 public class ViewProviderModule implements ProviderModule {
-  /**
-   * Mapping of view resource type to resource provider.
-   */
-  private final Map<Resource.Type, ResourceProvider> resourceProviders;
-
   /**
    * The delegate provider module.
    */
@@ -51,12 +44,9 @@ public class ViewProviderModule implements ProviderModule {
    * Construct a view provider module.
    *
    * @param providerModule     the delegate provider module
-   * @param resourceProviders  the map of view resource types to resource providers
    */
-  private ViewProviderModule(ProviderModule providerModule,
-                            Map<Resource.Type, ResourceProvider> resourceProviders) {
+  private ViewProviderModule(ProviderModule providerModule) {
     this.providerModule = providerModule;
-    this.resourceProviders = resourceProviders;
   }
 
 
@@ -65,6 +55,9 @@ public class ViewProviderModule implements ProviderModule {
   @Override
   public ResourceProvider getResourceProvider(Resource.Type type) {
 
+    Map<Resource.Type, ResourceProvider> resourceProviders =
+        ViewRegistry.getInstance().getResourceProviders();
+
     if (resourceProviders.containsKey(type)) {
       return resourceProviders.get(type);
     }
@@ -87,15 +80,6 @@ public class ViewProviderModule implements ProviderModule {
    * @return a view provider module
    */
   public static ViewProviderModule getViewProviderModule(ProviderModule module) {
-    Map<Resource.Type, ResourceProvider> resourceProviders = new HashMap<Resource.Type, ResourceProvider>();
-
-    ViewRegistry registry = ViewRegistry.getInstance();
-    for (ViewEntity definition : registry.getDefinitions()) {
-      for (Resource.Type type : definition.getViewResourceTypes()){
-        ResourceProvider provider = definition.getResourceProvider(type);
-        resourceProviders.put(type, provider);
-      }
-    }
-    return new ViewProviderModule(module, resourceProviders);
+    return new ViewProviderModule(module);
   }
 }

ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java

@@ -29,6 +29,7 @@ import org.apache.ambari.server.api.services.ViewExternalSubResourceService;
 import org.apache.ambari.server.api.services.ViewSubResourceService;
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.spi.Resource;
+import org.apache.ambari.server.controller.spi.ResourceProvider;
 import org.apache.ambari.server.orm.dao.MemberDAO;
 import org.apache.ambari.server.orm.dao.PrivilegeDAO;
 import org.apache.ambari.server.orm.dao.ResourceDAO;
@@ -124,6 +125,12 @@ public class ViewRegistry {
   private final Map<String, Set<SubResourceDefinition>> subResourceDefinitionsMap =
       new HashMap<String, Set<SubResourceDefinition>>();
 
+  /**
+   * Mapping of view types to resource providers.
+   */
+  private final Map<Resource.Type, ResourceProvider> resourceProviders =
+      new ConcurrentHashMap<Resource.Type, ResourceProvider>();
+
   /**
    * Mapping of view names to registered listeners.
    */
@@ -732,6 +739,15 @@ public class ViewRegistry {
     listeners.clear();
   }
 
+  /**
+   * Get the view resource provider mapping.
+   *
+   * @return the map of view resource providers
+   */
+  protected Map<Resource.Type, ResourceProvider> getResourceProviders() {
+    return resourceProviders;
+  }
+
   // get a view entity for the given internal view name
   private ViewEntity getDefinition(String viewName) {
     return viewDefinitions.get(viewName);
@@ -768,6 +784,8 @@ public class ViewRegistry {
         new ViewExternalSubResourceProvider(externalResourceType, viewDefinition);
     viewDefinition.addResourceProvider(externalResourceType, viewExternalSubResourceProvider );
 
+    resourceProviders.put(externalResourceType, viewExternalSubResourceProvider);
+
     ResourceInstanceFactoryImpl.addResourceDefinition(externalResourceType,
         new ViewExternalSubResourceDefinition(externalResourceType));
 
@@ -799,7 +817,9 @@ public class ViewRegistry {
         Class<?> clazz      = resourceConfiguration.getResourceClass(cl);
         String   idProperty = resourceConfiguration.getIdProperty();
 
-        viewDefinition.addResourceProvider(type, new ViewSubResourceProvider(type, clazz, idProperty, viewDefinition));
+        ViewSubResourceProvider provider = new ViewSubResourceProvider(type, clazz, idProperty, viewDefinition);
+        viewDefinition.addResourceProvider(type, provider);
+        resourceProviders.put(type, provider);
 
         resources.add(viewResourceEntity);
       }

ambari-server/src/test/java/org/apache/ambari/server/view/ViewRegistryTest.java

@@ -518,6 +518,26 @@ public class ViewRegistryTest {
     Assert.assertNull(listener.getLastEvent());
   }
 
+  @Test
+  public void testGetResourceProviders() throws Exception {
+
+    ViewConfig config = ViewConfigTest.getConfig();
+
+    ViewEntity viewDefinition = ViewEntityTest.getViewEntity();
+
+    ViewRegistry registry = ViewRegistry.getInstance();
+
+    registry.setupViewDefinition(viewDefinition, config, getClass().getClassLoader());
+
+    Map<Resource.Type, ResourceProvider> providerMap = registry.getResourceProviders();
+
+    Assert.assertEquals(3, providerMap.size());
+
+    Assert.assertTrue(providerMap.containsKey(Resource.Type.valueOf("MY_VIEW{1.0.0}/resource")));
+    Assert.assertTrue(providerMap.containsKey(Resource.Type.valueOf("MY_VIEW{1.0.0}/subresource")));
+    Assert.assertTrue(providerMap.containsKey(Resource.Type.valueOf("MY_VIEW{1.0.0}/resources")));
+  }
+
   @Test
   public void testAddGetDefinitions() throws Exception {
     ViewEntity viewDefinition = ViewEntityTest.getViewEntity();