ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [1/3] git commit: Revert "AMBARI-6263 API call to /hosts to get information about 10 hosts takes more than 30 seconds on 2K-node cluster (dsen)"
Date Thu, 26 Jun 2014 20:04:23 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk c188b96b3 -> d26f0c7b3


Revert "AMBARI-6263 API call to /hosts to get information about 10 hosts takes more than 30 seconds on 2K-node cluster (dsen)"

This reverts commit a17359c97c51263b51a15acc150e588db921d48a.


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

Branch: refs/heads/trunk
Commit: 59e3bd59591bc01397abe0d3a9f120bbc6f89fdd
Parents: c188b96
Author: Dmytro Sen <dsen@hortonworks.com>
Authored: Wed Jun 25 21:10:58 2014 +0300
Committer: Dmytro Sen <dsen@hortonworks.com>
Committed: Thu Jun 26 22:59:43 2014 +0300

----------------------------------------------------------------------
 .../ambari/server/api/query/QueryImpl.java      | 45 +++++++-------
 .../ambari/server/api/services/BaseRequest.java |  4 +-
 .../ganglia/GangliaPropertyProvider.java        | 62 ++++++++++----------
 .../ganglia/GangliaReportPropertyProvider.java  |  4 --
 .../internal/AbstractProviderModule.java        | 32 +++++-----
 .../internal/ClusterControllerImpl.java         | 24 ++------
 .../controller/internal/ResourceImpl.java       | 26 --------
 .../internal/StackDefinedPropertyProvider.java  | 45 +++++++-------
 .../controller/jmx/JMXPropertyProvider.java     |  4 +-
 .../nagios/NagiosPropertyProvider.java          | 16 ++---
 .../controller/spi/ClusterController.java       | 13 ++--
 .../ambari/server/controller/spi/Resource.java  | 13 ----
 .../ambari/server/state/host/HostImpl.java      |  6 +-
 .../server/utils/JaxbMapKeyListAdapter.java     |  4 +-
 .../server/utils/JaxbMapKeyMapAdapter.java      |  6 +-
 .../server/utils/JaxbMapKeyValAdapter.java      |  4 +-
 .../ganglia/GangliaPropertyProviderTest.java    | 15 -----
 .../GangliaReportPropertyProviderTest.java      |  1 -
 .../internal/ClusterControllerImplTest.java     | 26 ++++----
 .../StackDefinedPropertyProviderTest.java       | 25 +++-----
 .../controller/jmx/JMXPropertyProviderTest.java | 10 ----
 .../nagios/NagiosPropertyProviderTest.java      |  8 ---
 22 files changed, 137 insertions(+), 256 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
index 98d1db7..8017844 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/QueryImpl.java
@@ -337,9 +337,10 @@ public class QueryImpl implements Query, ResourceInstance {
     Request       request     = createRequest();
     Set<Resource> resourceSet = new LinkedHashSet<Resource>();
 
-    Set<Resource> queryResources = doQuery(resourceType, request, queryPredicate, pageRequest, sortRequest);
-    providerResourceSet.addAll(queryResources);
-    resourceSet.addAll(queryResources);
+    for (Resource queryResource : doQuery(resourceType, request, queryPredicate)) {
+      providerResourceSet.add(queryResource);
+      resourceSet.add(queryResource);
+    }
 
     queryResults.put(null, new QueryResult(
         request, queryPredicate, userPredicate, getKeyValueMap(), resourceSet));
@@ -366,23 +367,21 @@ public class QueryImpl implements Query, ResourceInstance {
 
       for (QueryResult queryResult : queryResults.values()) {
         for (Resource resource : queryResult.getProviderResourceSet()) {
-          if (resource.getPopulateRequiredFlag()) {
-            Map<Resource.Type, String> map = getKeyValueMap(resource, queryResult.getKeyValueMap());
-
-            Predicate     queryPredicate = subResource.createPredicate(map, subResource.processedPredicate);
-            Set<Resource> resourceSet    = new LinkedHashSet<Resource>();
-
-            try {
-              Set<Resource> queryResources =
-              subResource.doQuery(resourceType, request, queryPredicate, null, null);
-              providerResourceSet.addAll(queryResources);
-              resourceSet.addAll(queryResources);
-            } catch (NoSuchResourceException e) {
-              // do nothing ...
+          Map<Resource.Type, String> map = getKeyValueMap(resource, queryResult.getKeyValueMap());
+
+          Predicate     queryPredicate = subResource.createPredicate(map, subResource.processedPredicate);
+          Set<Resource> resourceSet    = new LinkedHashSet<Resource>();
+
+          try {
+            for (Resource queryResource : subResource.doQuery(resourceType, request, queryPredicate)) {
+              providerResourceSet.add(queryResource);
+              resourceSet.add(queryResource);
             }
-            subResource.queryResults.put(resource,
-                new QueryResult(request, queryPredicate, subResourcePredicate, map, resourceSet));
+          } catch (NoSuchResourceException e) {
+            // do nothing ...
           }
+          subResource.queryResults.put(resource,
+              new QueryResult(request, queryPredicate, subResourcePredicate, map, resourceSet));
         }
       }
       clusterController.populateResources(resourceType, providerResourceSet, request, null);
@@ -393,8 +392,7 @@ public class QueryImpl implements Query, ResourceInstance {
   /**
    * Query the cluster controller for the resources.
    */
-  private Set<Resource> doQuery(Resource.Type type, Request request,
-      Predicate predicate, PageRequest pageRequest, SortRequest sortRequest)
+  private Set<Resource> doQuery(Resource.Type type, Request request, Predicate predicate)
       throws UnsupportedPropertyException,
       SystemException,
       NoSuchResourceException,
@@ -403,11 +401,8 @@ public class QueryImpl implements Query, ResourceInstance {
     if (LOG.isDebugEnabled()) {
       LOG.debug("Executing resource query: " + request + " where " + predicate);
     }
-    if (userPredicate != null) {
-      pageRequest = null;
-      sortRequest = null;
-    }
-    return clusterController.getResources(type, request, predicate, pageRequest, sortRequest);
+
+    return clusterController.getResources(type, request, predicate);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
index d4d61f7..b7893c5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
@@ -244,14 +244,14 @@ public abstract class BaseRequest implements Request {
       if(from.equals("start")) {
         startingPoint = PageRequest.StartingPoint.Beginning;
       } else {
-        offset = Integer.parseInt(from);
+        offset = Integer.valueOf(from);
         startingPoint = PageRequest.StartingPoint.OffsetStart;
       }
     } else if (to != null ) {
       if (to.equals("end")) {
         startingPoint = PageRequest.StartingPoint.End;
       } else {
-        offset = Integer.parseInt(to);
+        offset = Integer.valueOf(to);
         startingPoint = PageRequest.StartingPoint.OffsetEnd;
       }
     } else {

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
index b92288a..4d623c1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProvider.java
@@ -205,49 +205,47 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider {
         new HashMap<String, Map<TemporalInfo, RRDRequest>>();
 
     for (Resource resource : resources) {
-      if (resource.getPopulateRequiredFlag()) {
-        String clusterName = (String) resource.getPropertyValue(clusterNamePropertyId);
-        Map<TemporalInfo, RRDRequest> requests = requestMap.get(clusterName);
-        if (requests == null) {
-          requests = new HashMap<TemporalInfo, RRDRequest>();
-          requestMap.put(clusterName, requests);
-        }
+      String clusterName = (String) resource.getPropertyValue(clusterNamePropertyId);
+      Map<TemporalInfo, RRDRequest> requests = requestMap.get(clusterName);
+      if (requests == null) {
+        requests = new HashMap<TemporalInfo, RRDRequest>();
+        requestMap.put(clusterName, requests);
+      }
 
-        Set<String> gangliaClusterNames = getGangliaClusterNames(resource, clusterName);
+      Set<String> gangliaClusterNames = getGangliaClusterNames(resource, clusterName);
 
-        for (String gangliaClusterName : gangliaClusterNames) {
-          ResourceKey key =
+      for (String gangliaClusterName : gangliaClusterNames) {
+        ResourceKey key =
             new ResourceKey(getHostName(resource), gangliaClusterName);
 
-          for (String id : ids) {
-            Map<String, PropertyInfo> propertyInfoMap = new HashMap<String, PropertyInfo>();
+        for (String id : ids) {
+          Map<String, PropertyInfo> propertyInfoMap = new HashMap<String, PropertyInfo>();
 
-            Map<String, PropertyInfo> componentMetricMap =
-              getComponentMetrics().get(getComponentName(resource));
+          Map<String, PropertyInfo> componentMetricMap =
+            getComponentMetrics().get(getComponentName(resource));
 
-            // Not all components have metrics
-            if (componentMetricMap != null &&
+          // Not all components have metrics
+          if (componentMetricMap != null &&
               !componentMetricMap.containsKey(id)) {
-              updateComponentMetricMap(componentMetricMap, id);
-            }
+            updateComponentMetricMap(componentMetricMap, id);
+          }
 
-            getPropertyInfoMap(getComponentName(resource), id, propertyInfoMap);
+          getPropertyInfoMap(getComponentName(resource), id, propertyInfoMap);
 
-            for (Map.Entry<String, PropertyInfo> entry : propertyInfoMap.entrySet()) {
-              String propertyId = entry.getKey();
-              PropertyInfo propertyInfo = entry.getValue();
+          for (Map.Entry<String, PropertyInfo> entry : propertyInfoMap.entrySet()) {
+            String propertyId = entry.getKey();
+            PropertyInfo propertyInfo = entry.getValue();
 
-              TemporalInfo temporalInfo = request.getTemporalInfo(id);
+            TemporalInfo temporalInfo = request.getTemporalInfo(id);
 
-              if ((temporalInfo == null && propertyInfo.isPointInTime()) || (temporalInfo != null && propertyInfo.isTemporal())) {
-                RRDRequest rrdRequest = requests.get(temporalInfo);
-                if (rrdRequest == null) {
-                  rrdRequest = new RRDRequest(clusterName, temporalInfo);
-                  requests.put(temporalInfo, rrdRequest);
-                }
-                rrdRequest.putResource(key, resource);
-                rrdRequest.putPropertyId(propertyInfo.getPropertyId(), propertyId);
+            if ((temporalInfo == null && propertyInfo.isPointInTime()) || (temporalInfo != null && propertyInfo.isTemporal())) {
+              RRDRequest rrdRequest = requests.get(temporalInfo);
+              if (rrdRequest == null) {
+                rrdRequest = new RRDRequest(clusterName, temporalInfo);
+                requests.put(temporalInfo, rrdRequest);
               }
+              rrdRequest.putResource(key, resource);              
+              rrdRequest.putPropertyId(propertyInfo.getPropertyId(), propertyId);
             }
           }
         }
@@ -504,7 +502,7 @@ public abstract class GangliaPropertyProvider extends AbstractPropertyProvider {
 
           while(val!=null && !"[~EOM]".equals(val)) {
             if (val.startsWith("[~r]")) {
-              int repeat = Integer.parseInt(val.substring(4)) - 1;
+              Integer repeat = Integer.valueOf(val.substring(4)) - 1;
               for (int i = 0; i < repeat; ++i) {
                 if (! "[~n]".equals(lastVal)) {
                   GangliaMetric.TemporalMetric tm = new GangliaMetric.TemporalMetric(lastVal, time);

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProvider.java
index 6f75b2b..35b156c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProvider.java
@@ -104,10 +104,6 @@ public class GangliaReportPropertyProvider extends AbstractPropertyProvider {
   private boolean populateResource(Resource resource, Request request, Predicate predicate)
       throws SystemException {
 
-    if (!resource.getPopulateRequiredFlag()) {
-      return false;
-    }
-
     Set<String> propertyIds = getPropertyIds();
 
     if (propertyIds.isEmpty()) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
index 3df4bd6..711e64e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java
@@ -70,8 +70,8 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
   private static final String GANGLIA_SERVER                            = "GANGLIA_SERVER";
   private static final String PROPERTIES_CATEGORY = "properties";
   private static final Map<Service.Type, String> serviceConfigVersions = new ConcurrentHashMap<Service.Type, String>();
-  private static final Map<Service.Type, String> serviceConfigTypes = new EnumMap<Service.Type, String>(Service.Type.class);
-  private static final Map<Service.Type, Map<String, String[]>> serviceDesiredProperties = new EnumMap<Service.Type, Map<String, String[]>>(Service.Type.class);
+  private static final Map<Service.Type, String> serviceConfigTypes = new HashMap<Service.Type, String>();
+  private static final Map<Service.Type, Map<String, String[]>> serviceDesiredProperties = new HashMap<Service.Type, Map<String, String[]>>();
   private static final Map<String, Service.Type> componentServiceMap = new HashMap<String, Service.Type>();
   
   private static final Map<String, Map<String, String[]>> jmxDesiredProperties = new HashMap<String, Map<String,String[]>>();
@@ -244,12 +244,12 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
             currVersion, serviceConfigTypes.get(service),
             serviceDesiredProperties.get(service));
           
-          for (Entry<String, String> entry : portMap.entrySet()) {
+          for (String compName : portMap.keySet()) {
             // portString will be null if the property defined for the component doesn't exist
             // this will trigger using the default port for the component
-            String portString = getPortString(entry.getValue());
+            String portString = getPortString(portMap.get(compName));
             if (null != portString)
-              clusterJmxPorts.put(entry.getKey(), portString);
+              clusterJmxPorts.put(compName, portString);
           }
         }
       } catch (Exception e) {
@@ -279,17 +279,17 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
           Map<String, String> refMap = new HashMap<String, String>();
           while(refValueString.contains("${")) {
               int startValueRef = refValueString.indexOf("${") + 2;
-              int endValueRef = refValueString.indexOf('}');
+              int endValueRef = refValueString.indexOf("}");
               String valueRef = refValueString.substring(startValueRef, endValueRef);
               refValueString = refValueString.substring(endValueRef+1);
               String trueValue = (String) postProcessPropertyValue(valueRef, properties.get(valueRef), properties, prevProps);
               if (trueValue != null){
-               refMap.put("${"+valueRef+ '}', trueValue);
+               refMap.put("${"+valueRef+"}", trueValue);
               } 
           }
-          for (Entry<String, String> entry : refMap.entrySet()){
-            refValueString = entry.getValue();
-            value = ((String)value).replace(entry.getKey(), refValueString);
+          for (String keyRef : refMap.keySet()){
+            refValueString = refMap.get(keyRef);
+            value = ((String)value).replace(keyRef, refValueString);
           }
           properties.put(key, value);
     }
@@ -655,7 +655,7 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
     Map<String, String> mConfigs = new HashMap<String, String>();
     if (configResources != null) {
       for (Resource res : configResources) {
-       Map<String, String> evaluatedProperties = null;
+       Map<String, String> evalutedProperties = null;                      
         for (Entry<String,String[]> entry : keys.entrySet()) {
           String propName = null;
           String value = null;
@@ -669,8 +669,8 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
           }
           
           if (value != null && value.contains("${")) {
-            if (evaluatedProperties == null){
-              evaluatedProperties = new HashMap<String, String>();
+            if (evalutedProperties == null){
+              evalutedProperties = new HashMap<String, String>();
               Map<String, Object> properties = res.getPropertiesMap().get(PROPERTIES_CATEGORY);
               for (Map.Entry<String, Object> subentry : properties.entrySet()) {
                 String keyString = subentry.getKey();
@@ -678,13 +678,13 @@ public abstract class AbstractProviderModule implements ProviderModule, Resource
                 String valueString;
                 if (object != null && object instanceof String){
                   valueString = (String)object;
-                  evaluatedProperties.put(keyString, valueString);
-                  postProcessPropertyValue(keyString, valueString, evaluatedProperties, null);
+                  evalutedProperties.put(keyString, valueString);
+                  postProcessPropertyValue(keyString, valueString, evalutedProperties, null);
                 }
               }              
             }
           }
-          value = postProcessPropertyValue(propName, value, evaluatedProperties, null);
+          value = postProcessPropertyValue(propName, value, evalutedProperties, null);
           LOG.debug("PROPERTY -> key: " + propName + ", " + "value: " + value);
           
           mConfigs.put(entry.getKey(), value);

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
index 9cc4736..3f8f317 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
@@ -110,8 +110,7 @@ public class ClusterControllerImpl implements ClusterController {
   // ----- ClusterController -------------------------------------------------
 
   @Override
-  public Set<Resource> getResources(Type type, Request request,
-      Predicate predicate, PageRequest pageRequest, SortRequest sortRequest)
+  public Set<Resource> getResources(Type type, Request request, Predicate predicate)
       throws UnsupportedPropertyException, NoSuchResourceException,
              NoSuchParentResourceException, SystemException {
     Set<Resource> resources;
@@ -133,17 +132,6 @@ public class ClusterControllerImpl implements ClusterController {
 
       // get the resources
       resources = provider.getResources(request, predicate);
-      Iterable<Resource> resourceIterable = resources;
-
-      //populate only resources in pageRequest
-      if ((pageRequest != null) || (sortRequest != null)) {
-        PageResponse page = getPage(type, resources, request, predicate, pageRequest, sortRequest);
-        resourceIterable = page.getIterable();
-      }
-
-      for (Resource resource: resourceIterable) {
-        resource.setPopulateRequiredFlag(true);
-      }
     }
     return resources;
   }
@@ -372,7 +360,7 @@ public class ClusterControllerImpl implements ClusterController {
       SystemException,
       NoSuchParentResourceException,
       NoSuchResourceException {
-    return getPageResponse(type, request, predicate, null, null).getIterable();
+    return getResources(type, request, predicate, null, null).getIterable();
   }
 
   /**
@@ -383,7 +371,6 @@ public class ClusterControllerImpl implements ClusterController {
    * @param request      the request
    * @param predicate    the predicate object which filters which resources are returned
    * @param pageRequest  the page request for a paginated response
-   * @param sortRequest  the sortRequest object which defines if the resources need to be sorted
    *
    * @return a page response representing the requested page of resources
    *
@@ -393,15 +380,14 @@ public class ClusterControllerImpl implements ClusterController {
    * @throws NoSuchResourceException no matching resource(s) found
    * @throws NoSuchParentResourceException a specified parent resource doesn't exist
    */
-  protected  PageResponse getPageResponse(Type type, Request request, Predicate predicate,
-                                          PageRequest pageRequest, SortRequest sortRequest)
+  protected  PageResponse getResources(Type type, Request request, Predicate predicate,
+                                       PageRequest pageRequest, SortRequest sortRequest)
       throws UnsupportedPropertyException,
       SystemException,
       NoSuchResourceException,
       NoSuchParentResourceException {
 
-    Set<Resource> providerResources =
-      getResources(type, request, predicate, pageRequest, sortRequest);
+    Set<Resource> providerResources = getResources(type, request, predicate);
     populateResources(type, providerResources, request, predicate);
     return getPage(type, providerResources, request, predicate, pageRequest, sortRequest);
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
index 43f7f37..15fb961 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ResourceImpl.java
@@ -37,11 +37,6 @@ public class ResourceImpl implements Resource {
   private final Type type;
 
   /**
-   * The resource populateRequiredFlag
-   */
-  private boolean populateRequiredFlag;
-
-  /**
    * The map of property maps keyed by property category.
    */
   private final Map<String, Map<String, Object>> propertiesMap = new TreeMap<String, Map<String, Object>>();
@@ -136,25 +131,6 @@ public class ResourceImpl implements Resource {
         null : properties.get(PropertyHelper.getPropertyName(id));
   }
 
-  /**
-   * Get the populateRequiredFlag
-   *
-   * @return the resource populateRequiredFlag
-   */
-  @Override
-  public boolean getPopulateRequiredFlag() {
-    return populateRequiredFlag;
-  }
-
-  /**
-   * Set a populateRequiredFlag on this resource.
-   *
-   * @param populateRequiredFlag
-   */
-  @Override
-  public void setPopulateRequiredFlag(boolean populateRequiredFlag) {
-    this.populateRequiredFlag = populateRequiredFlag;
-  }
 
   // ----- Object overrides --------------------------------------------------
 
@@ -190,6 +166,4 @@ public class ResourceImpl implements Resource {
   private String getCategoryKey(String category) {
     return category == null ? "" : category;
   }
-
-
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
index 3b09c09..51c7565 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProvider.java
@@ -128,33 +128,30 @@ public class StackDefinedPropertyProvider implements PropertyProvider {
     
     try {
       for (Resource r : resources) {
-        if (r.getPopulateRequiredFlag()) {
-          String clusterName = r.getPropertyValue(clusterNamePropertyId).toString();
-          String componentName = r.getPropertyValue(componentNamePropertyId).toString();
-
-          Cluster cluster = clusters.getCluster(clusterName);
-          StackId stack = cluster.getDesiredStackVersion();
-          String svc = metaInfo.getComponentToService(stack.getStackName(),
+        String clusterName = r.getPropertyValue(clusterNamePropertyId).toString();
+        String componentName = r.getPropertyValue(componentNamePropertyId).toString();
+        
+        Cluster cluster = clusters.getCluster(clusterName);
+        StackId stack = cluster.getDesiredStackVersion();
+        String svc = metaInfo.getComponentToService(stack.getStackName(),
             stack.getStackVersion(), componentName);
-
-          List<MetricDefinition> defs = metaInfo.getMetrics(
+        
+        List<MetricDefinition> defs = metaInfo.getMetrics(
             stack.getStackName(), stack.getStackVersion(), svc, componentName, type.name());
-
-          if (null == defs || 0 == defs.size())
-            continue;
-
-          for (MetricDefinition m : defs) {
-            if (m.getType().equals("ganglia")) {
-              gangliaMap.put(componentName, getPropertyInfo(m));
-            } else if (m.getType().equals("jmx")) {
-              jmxMap.put(componentName, getPropertyInfo(m));
-            } else {
-              PropertyProvider pp = getDelegate(m);
-              if (null != pp)
-                additional.add(pp);
-            }
+        
+        if (null == defs || 0 == defs.size())
+          continue;
+        
+        for (MetricDefinition m : defs) {
+          if (m.getType().equals("ganglia")) {
+            gangliaMap.put(componentName, getPropertyInfo(m));
+          } else if (m.getType().equals("jmx")) {
+            jmxMap.put(componentName, getPropertyInfo(m));
+          } else {
+            PropertyProvider pp = getDelegate(m);
+            if (null != pp)
+              additional.add(pp);
           }
-
         }
       }
         

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
index 5bcc5c0..a4dc2b2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jmx/JMXPropertyProvider.java
@@ -193,9 +193,7 @@ public class JMXPropertyProvider extends AbstractPropertyProvider {
     // In a large cluster we could have thousands of resources to populate here.
     // Distribute the work across multiple threads.
     for (Resource resource : resources) {
-      if (resource.getPopulateRequiredFlag()) {
-        completionService.submit(getPopulateResourceCallable(resource, request, predicate));
-      }
+      completionService.submit(getPopulateResourceCallable(resource, request, predicate));
     }
 
     Set<Resource> keepers = new HashSet<Resource>();

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProvider.java
index a93e908..ce1dc2f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProvider.java
@@ -177,12 +177,8 @@ public class NagiosPropertyProvider extends BaseProvider implements PropertyProv
     Set<String> propertyIds = getRequestPropertyIds(request, predicate);
     
     for (Resource res : resources) {
-      if (!res.getPopulateRequiredFlag()) {
-        continue;
-      }
-
       String matchValue = res.getPropertyValue(resourceTypeProperty).toString();
-
+      
       if (null == matchValue)
         continue;
 
@@ -193,18 +189,18 @@ public class NagiosPropertyProvider extends BaseProvider implements PropertyProv
       final String clusterName = clusterPropertyValue.toString();
       if (null == clusterName)
         continue;
-
+      
       if (!CLUSTER_ALERTS.containsKey(clusterName)) {
         // prevent endless looping for the first-time collection
         CLUSTER_ALERTS.put(clusterName, Collections.<NagiosAlert>emptyList());
-
+        
         Future<List<NagiosAlert>> f = scheduler.submit(new Callable<List<NagiosAlert>>() {
           @Override
           public List<NagiosAlert> call() throws Exception {
             return populateAlerts(clusterName);
           }
         });
-
+        
         if (waitOnFirstCall) {
           try {
             CLUSTER_ALERTS.put(clusterName, f.get());
@@ -214,9 +210,9 @@ public class NagiosPropertyProvider extends BaseProvider implements PropertyProv
           }
         }
       }
-
+      
       CLUSTER_NAMES.add(clusterName);
-
+      
       List<NagiosAlert> alerts = CLUSTER_ALERTS.get(clusterName);
       if (null != alerts) {
         updateAlerts (res, matchValue, alerts, propertyIds);

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
index ed59c9a..5e3f844 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
@@ -33,11 +33,9 @@ public interface ClusterController extends SchemaFactory {
    * Get the resources of the given type filtered by the given request and
    * predicate objects.
    *
-   * @param type        the type of the requested resources
-   * @param request     the request object which defines the desired set of properties
-   * @param predicate   the predicate object which filters which resources are returned
-   * @param pageRequest the page request for a paginated response
-   * @param sortRequest the sortRequest object which defines if the resources need to be sorted
+   * @param type      the type of the requested resources
+   * @param request   the request object which defines the desired set of properties
+   * @param predicate the predicate object which filters which resources are returned
    *
    * @return an iterable object of the requested resources
    *
@@ -47,8 +45,7 @@ public interface ClusterController extends SchemaFactory {
    * @throws NoSuchResourceException no matching resource(s) found
    * @throws NoSuchParentResourceException a specified parent resource doesn't exist
    */
-  Set<Resource> getResources(Resource.Type type, Request request,
-      Predicate predicate, PageRequest pageRequest, SortRequest sortRequest)
+  Set<Resource> getResources(Resource.Type type, Request request, Predicate predicate)
       throws UnsupportedPropertyException,
       NoSuchResourceException,
       NoSuchParentResourceException,
@@ -81,8 +78,6 @@ public interface ClusterController extends SchemaFactory {
    * @param providerResources  set of populated Resources
    * @param request            the request
    * @param predicate          the predicate object which filters which resources are returned
-   * @param pageRequest        the page request for a paginated response
-   * @param sortRequest        the sortRequest object which defines if the resources need to be sorted
    *
    * @return a page response representing the requested page of resources
    *

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
index ca365db..13e7c77 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/Resource.java
@@ -67,19 +67,6 @@ public interface Resource {
    */
   public Object getPropertyValue(String id);
 
-  /**
-   * Get the populateRequiredFlag
-   *
-   * @return the resource populateRequiredFlag
-   */
-  public boolean getPopulateRequiredFlag();
-
-  /**
-   * Set a populateRequiredFlag on this resource.
-   *
-   * @param populateRequiredFlag
-   */
-  public void setPopulateRequiredFlag(boolean populateRequiredFlag);
 
   // ----- Enum : InternalType -----------------------------------------------
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 1fe38d7..df97944 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -89,7 +89,7 @@ public class HostImpl implements Host {
   private static final String TIMEZONE = "timezone";
   private static final String OS_RELEASE_VERSION = "os_release_version";
 
-
+  
   private final Gson gson;
 
   private static final Type hostAttributesType =
@@ -97,7 +97,7 @@ public class HostImpl implements Host {
   private static final Type maintMapType =
       new TypeToken<Map<Long, MaintenanceState>>() {}.getType();
 
-  private final ReadWriteLock rwLock;
+  ReadWriteLock rwLock;
   private final Lock readLock;
   private final Lock writeLock;
 
@@ -361,7 +361,7 @@ public class HostImpl implements Host {
   }
 
   /**
-   * @param hostInfo to be imported
+   * @param hostInfo
    */
   @Override
   public void importHostInfo(HostInfo hostInfo) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyListAdapter.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyListAdapter.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyListAdapter.java
index c6f4be8..4589948 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyListAdapter.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyListAdapter.java
@@ -34,8 +34,8 @@ public class JaxbMapKeyListAdapter extends
     }
     JaxbMapKeyList[] list = new JaxbMapKeyList[map.size()] ;
     int index = 0;
-    for (Map.Entry<String, List<String>> stringListEntry : map.entrySet()) {
-      JaxbMapKeyList jaxbMap = new JaxbMapKeyList(stringListEntry.getKey(), stringListEntry.getValue());
+    for (String key : map.keySet()) {
+      JaxbMapKeyList jaxbMap = new JaxbMapKeyList(key, map.get(key));
       list[index++] = jaxbMap;
     }
     return list;

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyMapAdapter.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyMapAdapter.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyMapAdapter.java
index 32aeee6..8419d73 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyMapAdapter.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyMapAdapter.java
@@ -35,10 +35,10 @@ public class JaxbMapKeyMapAdapter extends
     }
     JaxbMapKeyMap[] list = new JaxbMapKeyMap[map.size()];
     int index=0;
-    for (Map.Entry<String, Map<String, String>> stringMapEntry : map.entrySet()) {
-      Map<String, String> value = stringMapEntry.getValue();
+    for (String key : map.keySet()) {
+      Map<String, String> value = map.get(key);
       JaxbMapKeyVal[] keyValList = mapAdapter.marshal(value);
-      list[index++] = new JaxbMapKeyMap(stringMapEntry.getKey(), keyValList);
+      list[index++] = new JaxbMapKeyMap(key, keyValList);
     }
     return list;
   }

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyValAdapter.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyValAdapter.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyValAdapter.java
index ff3cc0b..e3531cd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyValAdapter.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/JaxbMapKeyValAdapter.java
@@ -32,8 +32,8 @@ public class JaxbMapKeyValAdapter extends
     }
     JaxbMapKeyVal[] list = new JaxbMapKeyVal[m.size()] ;
     int index = 0;
-    for (Map.Entry<String, String> entry : m.entrySet()) {
-      JaxbMapKeyVal jaxbMap = new JaxbMapKeyVal(entry.getKey(), entry.getValue());
+    for (String key : m.keySet()) {
+      JaxbMapKeyVal jaxbMap = new JaxbMapKeyVal(key, m.get(key));
       list[index++] = jaxbMap;
     }
     return list;

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
index 1733297..4dc95a3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaPropertyProviderTest.java
@@ -115,7 +115,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "domU-12-31-39-0E-34-E1.compute-1.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "DATANODE");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -137,7 +136,6 @@ public class GangliaPropertyProviderTest {
     resource = new ResourceImpl(Resource.Type.HostComponent);
     resource.setProperty(HOST_NAME_PROPERTY_ID, "domU-12-31-39-0E-34-E1.compute-1.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "TASKTRACKER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -230,7 +228,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "domU-12-31-39-0E-34-E1.compute-1.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "DATANODE");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -269,7 +266,6 @@ public class GangliaPropertyProviderTest {
     // host
     Resource resource = new ResourceImpl(Resource.Type.Host);
     resource.setProperty(HOST_NAME_PROPERTY_ID, "corp-hadoopda05.client.ext");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -305,16 +301,13 @@ public class GangliaPropertyProviderTest {
     // host
     Resource resource = new ResourceImpl(Resource.Type.Host);
     resource.setProperty(HOST_NAME_PROPERTY_ID, "domU-12-31-39-0E-34-E1.compute-1.internal");
-    resource.setPopulateRequiredFlag(true);
     resources.add(resource);
 
     resource = new ResourceImpl(Resource.Type.Host);
     resource.setProperty(HOST_NAME_PROPERTY_ID, "domU-12-31-39-0E-34-E2.compute-1.internal");
-    resource.setPopulateRequiredFlag(true);
     resources.add(resource);
 
     resource = new ResourceImpl(Resource.Type.Host);
-    resource.setPopulateRequiredFlag(true);
     resource.setProperty(HOST_NAME_PROPERTY_ID, "domU-12-31-39-0E-34-E3.compute-1.internal");
     resources.add(resource);
 
@@ -368,7 +361,6 @@ public class GangliaPropertyProviderTest {
     for (int i = 0; i < 150; ++i) {
       Resource resource = new ResourceImpl(Resource.Type.Host);
       resource.setProperty(HOST_NAME_PROPERTY_ID, "host" + i);
-      resource.setPopulateRequiredFlag(true);
       resources.add(resource);
       
       if (hostsList.length() != 0)
@@ -427,7 +419,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -486,7 +477,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -549,7 +539,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER");
-    resource.setPopulateRequiredFlag(true);
 
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
     Request  request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), temporalInfoMap);
@@ -585,7 +574,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -644,7 +632,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -703,7 +690,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -763,7 +749,6 @@ public class GangliaPropertyProviderTest {
 
     resource.setProperty(HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(COMPONENT_NAME_PROPERTY_ID, "FLUME_HANDLER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
index e71c867..1ae17b3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/ganglia/GangliaReportPropertyProviderTest.java
@@ -86,7 +86,6 @@ public class GangliaReportPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Cluster);
 
     resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
index 7007bbc..1d0eef4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
@@ -138,7 +138,7 @@ public class ClusterControllerImplTest {
 
     // get the first two
     PageRequest pageRequest = new PageRequestImpl(PageRequest.StartingPoint.Beginning, 2, 0, null, null);
-    PageResponse pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    PageResponse pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     Iterable<Resource> iterable = pageResponse.getIterable();
     List<Resource> list = new LinkedList<Resource>();
@@ -156,7 +156,7 @@ public class ClusterControllerImplTest {
 
     // get the first three
     pageRequest = new PageRequestImpl(PageRequest.StartingPoint.Beginning, 3, 0, null, null);
-    pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     iterable = pageResponse.getIterable();
     list = new LinkedList<Resource>();
@@ -193,7 +193,7 @@ public class ClusterControllerImplTest {
       Collections.singletonList(new SortRequestProperty("Hosts/host_name", SortRequest.Order.ASC));
     SortRequest sortRequest = new SortRequestImpl(sortRequestProperties);
 
-    Iterable<Resource> iterable = controller.getPageResponse(Resource.Type.Host,
+    Iterable<Resource> iterable = controller.getResources(Resource.Type.Host,
       request, null, null, sortRequest).getIterable();
 
     List<Resource> list = new LinkedList<Resource>();
@@ -213,7 +213,7 @@ public class ClusterControllerImplTest {
       new SortRequestProperty("Hosts/host_name", SortRequest.Order.DESC));
     sortRequest = new SortRequestImpl(sortRequestProperties);
 
-    iterable = controller.getPageResponse(Resource.Type.Host,
+    iterable = controller.getResources(Resource.Type.Host,
       request, null, null, sortRequest).getIterable();
 
     list = new LinkedList<Resource>();
@@ -248,7 +248,7 @@ public class ClusterControllerImplTest {
       }};
     SortRequest sortRequest = new SortRequestImpl(sortRequestProperties);
 
-    Iterable<Resource> iterable = controller.getPageResponse(Resource.Type.Host,
+    Iterable<Resource> iterable = controller.getResources(Resource.Type.Host,
       request, null, null, sortRequest).getIterable();
 
     List<Resource> list = new LinkedList<Resource>();
@@ -274,7 +274,7 @@ public class ClusterControllerImplTest {
 
     // get the middle two (1 - 2)
     PageRequest pageRequest = new PageRequestImpl(PageRequest.StartingPoint.OffsetStart, 2, 1, null, null);
-    PageResponse pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    PageResponse pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     Assert.assertEquals(1, pageResponse.getOffset());
     Assert.assertEquals("host:0", pageResponse.getPreviousResource().getPropertyValue(PropertyHelper.getPropertyId("Hosts", "host_name")));
@@ -296,7 +296,7 @@ public class ClusterControllerImplTest {
 
     // get the last three (0 - 2)
     pageRequest = new PageRequestImpl(PageRequest.StartingPoint.OffsetStart, 3, 0, null, null);
-    pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     Assert.assertEquals(0, pageResponse.getOffset());
     Assert.assertNull(pageResponse.getPreviousResource());
@@ -329,7 +329,7 @@ public class ClusterControllerImplTest {
 
     // get the last two
     PageRequest pageRequest = new PageRequestImpl(PageRequest.StartingPoint.End, 2, 0, null, null);
-    PageResponse pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    PageResponse pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     Iterable<Resource> iterable = pageResponse.getIterable();
     List<Resource> list = new LinkedList<Resource>();
@@ -347,7 +347,7 @@ public class ClusterControllerImplTest {
 
     // get the last three
     pageRequest = new PageRequestImpl(PageRequest.StartingPoint.End, 3, 0, null, null);
-    pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     iterable = pageResponse.getIterable();
     list = new LinkedList<Resource>();
@@ -376,7 +376,7 @@ public class ClusterControllerImplTest {
 
     // get the middle two (1 - 2)
     PageRequest pageRequest = new PageRequestImpl(PageRequest.StartingPoint.OffsetEnd, 2, 2, null, null);
-    PageResponse pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    PageResponse pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     Assert.assertEquals(1, pageResponse.getOffset());
     Assert.assertEquals("host:0", pageResponse.getPreviousResource().getPropertyValue(PropertyHelper.getPropertyId("Hosts", "host_name")));
@@ -398,7 +398,7 @@ public class ClusterControllerImplTest {
 
     // get the last three (0 - 2)
     pageRequest = new PageRequestImpl(PageRequest.StartingPoint.OffsetEnd, 3, 2, null, null);
-    pageResponse = controller.getPageResponse(Resource.Type.Host, request, null, pageRequest, null);
+    pageResponse = controller.getResources(Resource.Type.Host, request, null, pageRequest, null);
 
     Assert.assertEquals(0, pageResponse.getOffset());
     Assert.assertNull(pageResponse.getPreviousResource());
@@ -556,7 +556,7 @@ public class ClusterControllerImplTest {
     PageRequest pageRequest =
       new PageRequestImpl(PageRequest.StartingPoint.Beginning, 1, 0, null, null);
     PageResponse pageResponse =
-      controller.getPageResponse(Resource.Type.Host, request, predicate, pageRequest, sortRequest);
+      controller.getResources(Resource.Type.Host, request, predicate, pageRequest, sortRequest);
 
     Iterable<Resource> iterable = pageResponse.getIterable();
     List<Resource> list = new LinkedList<Resource>();
@@ -574,7 +574,7 @@ public class ClusterControllerImplTest {
 
     pageRequest =
       new PageRequestImpl(PageRequest.StartingPoint.OffsetStart, 1, 1, null, null);
-    pageResponse = controller.getPageResponse(
+    pageResponse = controller.getResources(
       Resource.Type.Host, request, predicate, pageRequest, sortRequest);
 
     iterable = pageResponse.getIterable();

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
index b40d892..2a086ae 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackDefinedPropertyProviderTest.java
@@ -26,8 +26,12 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Map.Entry;
 
+import org.apache.ambari.server.controller.ganglia.GangliaHostComponentPropertyProvider;
+import org.apache.ambari.server.controller.ganglia.GangliaPropertyProvider;
 import org.apache.ambari.server.controller.ganglia.GangliaPropertyProviderTest.TestGangliaHostProvider;
+import org.apache.ambari.server.controller.jmx.JMXPropertyProvider;
 import org.apache.ambari.server.controller.jmx.TestStreamProvider;
 import org.apache.ambari.server.controller.jmx.JMXPropertyProviderTest.TestJMXHostProvider;
 import org.apache.ambari.server.controller.spi.Predicate;
@@ -45,6 +49,7 @@ import org.apache.ambari.server.state.Clusters;
 import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.stack.Metric;
+import org.apache.http.client.utils.URIBuilder;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
@@ -111,8 +116,7 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty("HostRoles/host_name", "h1");
     resource.setProperty("HostRoles/component_name", "NAMENODE");
     resource.setProperty("HostRoles/state", "STARTED");
-    resource.setPopulateRequiredFlag(true);
-
+    
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
 
@@ -143,8 +147,7 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty("HostRoles/host_name", "h1");
     resource.setProperty("HostRoles/component_name", "DATANODE");
     resource.setProperty("HostRoles/state", "STARTED");
-    resource.setPopulateRequiredFlag(true);
-
+    
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
 
@@ -310,7 +313,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -370,7 +372,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -422,7 +423,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -459,7 +459,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -511,7 +510,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "h1");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -569,7 +567,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "JOURNALNODE");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -694,7 +691,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "STORM_REST_API");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -771,7 +767,7 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "HBASE_MASTER");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
+
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -813,7 +809,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty("HostRoles/cluster_name", "c1");
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "dev01.ambari.apache.org");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
-    resource.setPopulateRequiredFlag(true);
 
     String RM_CATEGORY_1 = "metrics/yarn/Queue/root/default";
     String RM_AVAILABLE_MEMORY_PROPERTY = PropertyHelper.getPropertyId(RM_CATEGORY_1, "AvailableMB");
@@ -860,7 +855,6 @@ public class StackDefinedPropertyProviderTest {
     resource.setProperty("HostRoles/cluster_name", "c1");
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "JOURNALNODE");
-    resource.setPopulateRequiredFlag(true);
 
 
     Object[][] testData = {
@@ -983,8 +977,7 @@ public class StackDefinedPropertyProviderTest {
       resource.setProperty("HostRoles/cluster_name", "c1");
       resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "ip-10-39-113-33.ec2.internal");
       resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "RESOURCEMANAGER");
-      resource.setPopulateRequiredFlag(true);
-
+      
       // only ask for one property
       Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
       temporalInfoMap.put(metric, new TemporalInfoImpl(10L, 20L, 1L));

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
index 08e7eed..ac7314e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/jmx/JMXPropertyProviderTest.java
@@ -65,7 +65,6 @@ public class JMXPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "NAMENODE");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -91,7 +90,6 @@ public class JMXPropertyProviderTest {
 
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "DATANODE");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -113,7 +111,6 @@ public class JMXPropertyProviderTest {
 
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "JOBTRACKER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for specific properties
     Set<String> properties = new HashSet<String>();
@@ -156,7 +153,6 @@ public class JMXPropertyProviderTest {
 
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "TASKTRACKER");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for specific properties
     properties = new HashSet<String>();
@@ -210,7 +206,6 @@ public class JMXPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "HBASE_MASTER");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for specific properties
     properties = new HashSet<String>();
@@ -256,7 +251,6 @@ public class JMXPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "NAMENODE");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // only ask for one property
     Map<String, TemporalInfo> temporalInfoMap = new HashMap<String, TemporalInfo>();
@@ -292,7 +286,6 @@ public class JMXPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "NAMENODE");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     // only ask for one property
@@ -329,7 +322,6 @@ public class JMXPropertyProviderTest {
 
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "NAMENODE");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -371,7 +363,6 @@ public class JMXPropertyProviderTest {
     resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-0e-34-e1.compute-1.internal");
     resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "NAMENODE");
     resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "INSTALLED");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet());
@@ -406,7 +397,6 @@ public class JMXPropertyProviderTest {
       resource.setProperty(HOST_COMPONENT_HOST_NAME_PROPERTY_ID, "domu-12-31-39-14-ee-b3.compute-1.internal");
       resource.setProperty(HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID, "DATANODE");
       resource.setProperty("unique_id", i);
-      resource.setPopulateRequiredFlag(true);
 
       resources.add(resource);
     }

http://git-wip-us.apache.org/repos/asf/ambari/blob/59e3bd59/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java
index 7e3642b..92d3c40 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/nagios/NagiosPropertyProviderTest.java
@@ -164,7 +164,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Cluster);
     resource.setProperty("Clusters/cluster_name", "c1");
     resource.setProperty("Clusters/version", "HDP-2.0.6");
-    resource.setPopulateRequiredFlag(true);
 
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
@@ -247,7 +246,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Service);
     resource.setProperty("ServiceInfo/cluster_name", "c1");
     resource.setProperty("ServiceInfo/service_name", "HBASE");
-    resource.setPopulateRequiredFlag(true);
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
@@ -299,7 +297,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Service);
     resource.setProperty("Hosts/cluster_name", "c1");
     resource.setProperty("Hosts/host_name", "c6403.ambari.apache.org");
-    resource.setPopulateRequiredFlag(true);
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
@@ -351,7 +348,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Service);
     resource.setProperty("Hosts/cluster_name", "c1");
     resource.setProperty("Hosts/host_name", "c6401.ambari.apache.org");
-    resource.setPopulateRequiredFlag(true);
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
@@ -407,7 +403,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Service);
     resource.setProperty("ServiceInfo/cluster_name", "c1");
     resource.setProperty("ServiceInfo/service_name", "HBASE");
-    resource.setPopulateRequiredFlag(true);
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
@@ -481,7 +476,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Service);
     resource.setProperty("ServiceInfo/cluster_name", "c1");
     resource.setProperty("ServiceInfo/service_name", "GANGLIA");
-    resource.setPopulateRequiredFlag(true);
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
@@ -535,7 +529,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Host);
     resource.setProperty("Hosts/cluster_name", "c1");
     resource.setProperty("Hosts/host_name", "c6404.ambari.apache.org");
-    resource.setPopulateRequiredFlag(true);
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());
@@ -624,7 +617,6 @@ public class NagiosPropertyProviderTest {
     Resource resource = new ResourceImpl(Resource.Type.Service);
     resource.setProperty("ServiceInfo/cluster_name", "c1");
     resource.setProperty("ServiceInfo/service_name", "GANGLIA");
-    resource.setPopulateRequiredFlag(true);
     
     // request with an empty set should get all supported properties
     Request request = PropertyHelper.getReadRequest(Collections.<String>emptySet(), new HashMap<String, TemporalInfo>());


Mime
View raw message