[09/14] git commit: AMBARI-7418 - Views: cannot create instance w/o a restart.

2014-09-20 Thread jonathanhurley 
AMBARI-7418 - Views: cannot create instance w/o a restart.


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c840be07
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c840be07
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c840be07

Branch: refs/heads/branch-alerts-dev
Commit: c840be073d1b969b50bedee9d8252dbc20ea9ab9
Parents: 4005051
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Fri Sep 19 18:32:31 2014 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Fri Sep 19 18:49:46 2014 -0400

--
 .../ambari/server/view/ViewProviderModule.java  | 26 
 .../apache/ambari/server/view/ViewRegistry.java | 22 -
 .../ambari/server/view/ViewRegistryTest.java| 20 +++
 3 files changed, 46 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c840be07/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
index edaff1b..5fadf22 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
+++ 
b/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;
 
@@ -35,11 +33,6 @@ import java.util.Map;
  */
 public class ViewProviderModule implements ProviderModule {
   /**
-   * Mapping of view resource type to resource provider.
-   */
-  private final MapResource.Type, ResourceProvider resourceProviders;
-
-  /**
* The delegate provider module.
*/
   private final ProviderModule providerModule;
@@ -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,
-MapResource.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) {
 
+MapResource.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) {
-MapResource.Type, ResourceProvider resourceProviders = new 
HashMapResource.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);
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/c840be07/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java 
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index 5e652a1..58c4334 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++ 
b/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

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

2014-09-19 Thread tbeerbower 
Repository: ambari
Updated Branches:
  refs/heads/trunk 40050513e - c840be073


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


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c840be07
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c840be07
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c840be07

Branch: refs/heads/trunk
Commit: c840be073d1b969b50bedee9d8252dbc20ea9ab9
Parents: 4005051
Author: tbeerbower tbeerbo...@hortonworks.com
Authored: Fri Sep 19 18:32:31 2014 -0400
Committer: tbeerbower tbeerbo...@hortonworks.com
Committed: Fri Sep 19 18:49:46 2014 -0400

--
 .../ambari/server/view/ViewProviderModule.java  | 26 
 .../apache/ambari/server/view/ViewRegistry.java | 22 -
 .../ambari/server/view/ViewRegistryTest.java| 20 +++
 3 files changed, 46 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ambari/blob/c840be07/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
 
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
index edaff1b..5fadf22 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewProviderModule.java
+++ 
b/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;
 
@@ -35,11 +33,6 @@ import java.util.Map;
  */
 public class ViewProviderModule implements ProviderModule {
   /**
-   * Mapping of view resource type to resource provider.
-   */
-  private final MapResource.Type, ResourceProvider resourceProviders;
-
-  /**
* The delegate provider module.
*/
   private final ProviderModule providerModule;
@@ -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,
-MapResource.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) {
 
+MapResource.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) {
-MapResource.Type, ResourceProvider resourceProviders = new 
HashMapResource.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);
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/c840be07/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
--
diff --git 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java 
b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
index 5e652a1..58c4334 100644
--- 
a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewRegistry.java
+++ 
b/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