AMBARI-24245. Fix FindBugs warnings (#2398)

* mutable static fields
* boxing to parse primitive value
* dead local store (value is not read or used)
* non-short-circuit logic
* useless method (no side-effect, return value ignored)
* input must be non-null but is marked as nullable
* redundant nullcheck
* defines equals and uses Object.hashCode
* comparison of String using !=
* array formatted in useless way
* nullcheck of previously dereferenced value
* suspicious reference comparison
* Suppress FindBugs warnings for EclipseLink-generated code
* ignore dead local store to entity variables
* dead local store (unused variables and useless assignments)
* null pointer dereference
* mutable static field
* Simplify using Sets.immutableEnumSet

ambari-server/findbugs.exclude.xml

@@ -20,6 +20,15 @@
   <Match>
     <Class name="~.*Entity" />
     <Method name="~_persistence_[gs]et" />
-    <Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ" />
+    <Bug pattern="EI_EXPOSE_REP,EI_EXPOSE_REP2,ES_COMPARING_PARAMETER_STRING_WITH_EQ" />
+  </Match>
+  <Match>
+    <Class name="~.*Entity" />
+    <Method name="~_persistence_[gs]et_.*" />
+    <Bug pattern="DM_NUMBER_CTOR,EI_EXPOSE_REP,EI_EXPOSE_REP2,NM_CONFUSING" />
+  </Match>
+  <Match>
+    <Local name="~.*Entity" />
+    <Bug pattern="DLS_DEAD_LOCAL_STORE" />
   </Match>
 </FindBugsFilter>

ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java

@@ -21,7 +21,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -514,7 +513,6 @@ public class ActionDBAccessorImpl implements ActionDBAccessor {
     long now = System.currentTimeMillis();
 
     List<Long> requestsToCheck = new ArrayList<>();
-    List<Long> abortedCommandUpdates = new ArrayList<>();
 
     List<HostRoleCommandEntity> commandEntities = hostRoleCommandDAO.findByPKs(taskReports.keySet());
     List<HostRoleCommandEntity> commandEntitiesToMerge = new ArrayList<>();
@@ -780,7 +778,7 @@ public class ActionDBAccessorImpl implements ActionDBAccessor {
       return requestDAO.findAllRequestIds(maxResults, ascOrder);
     }
 
-    EnumSet<HostRoleStatus> taskStatuses = null;
+    Set<HostRoleStatus> taskStatuses = null;
     switch( status ){
       case IN_PROGRESS:
         taskStatuses = HostRoleStatus.IN_PROGRESS_STATUSES;

ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java

@@ -401,14 +401,6 @@ class ActionScheduler implements Runnable {
 
       int i_stage = 0;
 
-      // get the range of requests in progress
-      long iLowestRequestIdInProgress = firstStageInProgressPerRequest.get(0).getRequestId();
-      long iHighestRequestIdInProgress = firstStageInProgressPerRequest.get(
-          firstStageInProgressPerRequest.size() - 1).getRequestId();
-
-      List<String> hostsWithPendingTasks = hostRoleCommandDAO.getHostsWithPendingTasks(
-          iLowestRequestIdInProgress, iHighestRequestIdInProgress);
-
       // filter the stages in progress down to those which can be scheduled in
       // parallel
       List<Stage> stages = filterParallelPerHostStages(firstStageInProgressPerRequest);

ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java

@@ -17,10 +17,13 @@
  */
 package org.apache.ambari.server.actionmanager;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Set;
+
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Sets;
 
 public enum HostRoleStatus {
   /**
@@ -78,47 +81,50 @@ public enum HostRoleStatus {
    */
   SKIPPED_FAILED;
 
-  private static List<HostRoleStatus> COMPLETED_STATES = Arrays.asList(FAILED, TIMEDOUT, ABORTED,
-      COMPLETED, SKIPPED_FAILED);
+  private static final List<HostRoleStatus> COMPLETED_STATES = ImmutableList.of(
+    FAILED, TIMEDOUT, ABORTED, COMPLETED, SKIPPED_FAILED);
 
-  private static List<HostRoleStatus> HOLDING_STATES = Arrays.asList(HOLDING, HOLDING_FAILED,
-      HOLDING_TIMEDOUT);
+  private static final List<HostRoleStatus> HOLDING_STATES = ImmutableList.of(
+    HOLDING, HOLDING_FAILED, HOLDING_TIMEDOUT);
 
-  public static List<HostRoleStatus> SCHEDULED_STATES = Arrays.asList(PENDING, QUEUED, IN_PROGRESS);
+  public static final List<HostRoleStatus> SCHEDULED_STATES = ImmutableList.of(
+    PENDING, QUEUED, IN_PROGRESS);
 
   /**
    * The {@link HostRoleStatus}s that represent any commands which are
    * considered to be "Failed".
    */
-  public static EnumSet<HostRoleStatus> FAILED_STATUSES = EnumSet.of(FAILED, TIMEDOUT, ABORTED,
-      SKIPPED_FAILED);
+  public static final Set<HostRoleStatus> FAILED_STATUSES = Sets.immutableEnumSet(
+    FAILED, TIMEDOUT, ABORTED, SKIPPED_FAILED);
 
   /**
    * The {@link HostRoleStatus}s that represent any commands which are
    * considered to be "Failed" and next commands can not be executed.
    */
-  public static EnumSet<HostRoleStatus> NOT_SKIPPABLE_FAILED_STATUSES = EnumSet.of(FAILED, TIMEDOUT, ABORTED);
+  public static final Set<HostRoleStatus> NOT_SKIPPABLE_FAILED_STATUSES = Sets.immutableEnumSet(
+    FAILED, TIMEDOUT, ABORTED);
 
   /**
    * The {@link HostRoleStatus}s that represent the current commands that failed during stack upgrade.
    * This is not used to indicate commands that failed and then skipped.
    */
-  public static EnumSet<HostRoleStatus> STACK_UPGRADE_FAILED_STATUSES = EnumSet.of(FAILED, HOLDING_FAILED,
-      HOLDING_TIMEDOUT);
+  public static final Set<HostRoleStatus> STACK_UPGRADE_FAILED_STATUSES = Sets.immutableEnumSet(
+    FAILED, HOLDING_FAILED, HOLDING_TIMEDOUT);
 
   /**
    * The {@link HostRoleStatus}s that represent any commands which are
    * considered to be "In Progress".
    */
-  public static final EnumSet<HostRoleStatus> IN_PROGRESS_STATUSES = EnumSet.of(
-      HostRoleStatus.QUEUED, HostRoleStatus.IN_PROGRESS,
-      HostRoleStatus.PENDING, HostRoleStatus.HOLDING,
-      HostRoleStatus.HOLDING_FAILED, HostRoleStatus.HOLDING_TIMEDOUT);
+  public static final Set<HostRoleStatus> IN_PROGRESS_STATUSES = Sets.immutableEnumSet(
+      QUEUED, IN_PROGRESS,
+      PENDING, HOLDING,
+      HOLDING_FAILED, HOLDING_TIMEDOUT);
 
   /**
    * The {@link HostRoleStatus}s that represent all non-completed states.
    */
-  public static final EnumSet<HostRoleStatus> NOT_COMPLETED_STATUSES = EnumSet.complementOf(EnumSet.of(COMPLETED));
+  public static final Set<HostRoleStatus> NOT_COMPLETED_STATUSES = ImmutableSet.copyOf(
+    EnumSet.complementOf(EnumSet.of(COMPLETED)));
 
   /**
    * Indicates whether or not it is a valid failure state.
@@ -166,7 +172,7 @@ public enum HostRoleStatus {
    * @return list of completed states
    */
   public static List<HostRoleStatus> getCompletedStates() {
-    return Collections.unmodifiableList(COMPLETED_STATES);
+    return COMPLETED_STATES;
   }
 
   /**

ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java

@@ -56,7 +56,6 @@ import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
 import org.apache.ambari.server.state.ServiceInfo;
 import org.apache.ambari.server.state.StackId;
-import org.apache.ambari.server.state.StackInfo;
 import org.apache.ambari.server.state.State;
 import org.apache.ambari.server.state.fsm.InvalidStateTransitionException;
 import org.apache.ambari.server.state.host.HostHeartbeatLostEvent;
@@ -214,8 +213,6 @@ public class HeartbeatMonitor implements Runnable {
     ComponentInfo componentInfo = ambariMetaInfo.getComponent(
             stackId.getStackName(), stackId.getStackVersion(),
             serviceName, componentName);
-    StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(),
-        stackId.getStackVersion());
 
     Map<String, Map<String, String>> configurations = new TreeMap<>();
     Map<String, Map<String,  Map<String, String>>> configurationAttributes = new TreeMap<>();

ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java

@@ -395,7 +395,6 @@ public class HeartbeatProcessor extends AbstractService{
               Map<String, String> keytabs = writeKeytabsStructuredOut.getKeytabs();
               if (keytabs != null) {
                 for (Map.Entry<String, String> entry : keytabs.entrySet()) {
-                  String principal = entry.getKey();
                   String keytabPath = entry.getValue();
                   for (KerberosKeytabPrincipalEntity kkpe: kerberosKeytabPrincipalDAO.findByHostAndKeytab(host.getHostId(), keytabPath)) {
                     kkpe.setDistributed(true);

ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java

@@ -41,7 +41,6 @@ import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.Service;
 import org.apache.ambari.server.state.ServiceComponent;
 import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.ambari.server.state.StackId;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,7 +102,6 @@ public class TopologyHolder extends AgentClusterDataHolder<TopologyUpdateEvent>
               .collect(Collectors.toSet());
             String serviceName = sch.getServiceName();
             String componentName = sch.getServiceComponentName();
-            StackId stackId = cl.getDesiredStackVersion();
 
             TopologyComponent topologyComponent = TopologyComponent.newBuilder()
                 .setComponentName(sch.getServiceComponentName())

ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java

@@ -271,7 +271,7 @@ public class ClusterBlueprintRenderer extends BaseRenderer implements Renderer {
     Set<Map<String, String>> serviceSettingValue = new HashSet<>();
     Set<Map<String, String>> componentSettingValue = new HashSet<>();
 
-    HashMap<String, String> property = new HashMap<>();
+    HashMap<String, String> property;
     HashMap<String, String> componentProperty = new HashMap<>();
     Boolean globalRecoveryEnabled = false;
 

ambari-server/src/main/java/org/apache/ambari/server/api/resources/RepositoryResourceDefinition.java

@@ -25,7 +25,7 @@ import com.google.common.collect.Sets;
 
 public class RepositoryResourceDefinition extends BaseResourceDefinition {
 
-  public static String VALIDATE_ONLY_DIRECTIVE = "validate_only";
+  public static final String VALIDATE_ONLY_DIRECTIVE = "validate_only";
 
   public RepositoryResourceDefinition() {
     super(Resource.Type.Repository);

ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java

@@ -28,7 +28,7 @@ import org.apache.ambari.server.controller.spi.Resource;
  */
 public class UpgradeResourceDefinition extends SimpleResourceDefinition {
 
-  public static String SKIP_SERVICE_CHECKS_DIRECTIVE = "skip_service_checks";
+  public static final String SKIP_SERVICE_CHECKS_DIRECTIVE = "skip_service_checks";
 
   /**
    * Constructor.

ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java

@@ -267,7 +267,7 @@ public abstract class BaseRequest implements Request {
 
     // TODO : support predicate and comparator
     return new PageRequestImpl(startingPoint,
-        pageSize == null ? DEFAULT_PAGE_SIZE : Integer.valueOf(pageSize), offset, null, null);
+        pageSize == null ? DEFAULT_PAGE_SIZE : Integer.parseInt(pageSize), offset, null, null);
   }
 
   @Override

ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java

@@ -36,8 +36,6 @@ import org.apache.ambari.server.api.services.stackadvisor.validations.Validation
 import org.apache.ambari.server.configuration.Configuration;
 import org.apache.ambari.server.controller.internal.AmbariServerConfigurationHandler;
 import org.apache.ambari.server.state.ServiceInfo;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -46,8 +44,6 @@ import com.google.inject.Singleton;
 @Singleton
 public class StackAdvisorHelper {
 
-  protected static Log LOG = LogFactory.getLog(StackAdvisorHelper.class);
-
   private File recommendationsDir;
   private String recommendationsArtifactsLifetime;
   private int recommendationsArtifactsRolloverMax;

ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRunner.java

@@ -121,7 +121,7 @@ public class StackAdvisorRunner {
    * @throws StackAdvisorException
    */
   private void processLogs(int exitCode, String outputFile, String errorFile) throws StackAdvisorException {
-    String outMessage = printMessage("stdout", outputFile);
+    printMessage("stdout", outputFile);
     String errMessage = printMessage("stderr", errorFile);
 
     try {

ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java

@@ -116,8 +116,8 @@ public class AmbariMetricsHadoopSinkVersionCompatibilityCheck extends AbstractCh
 
     if(checkProperties != null) {
       minHadoopSinkVersion = checkProperties.get(MIN_HADOOP_SINK_VERSION_PROPERTY_NAME);
-      retryInterval = Long.valueOf(checkProperties.getOrDefault(RETRY_INTERVAL_PROPERTY_NAME, "6000"));
-      numTries = Integer.valueOf(checkProperties.getOrDefault(NUM_TRIES_PROPERTY_NAME, "20"));
+      retryInterval = Long.parseLong(checkProperties.getOrDefault(RETRY_INTERVAL_PROPERTY_NAME, "6000"));
+      numTries = Integer.parseInt(checkProperties.getOrDefault(NUM_TRIES_PROPERTY_NAME, "20"));
     }
 
     if (StringUtils.isEmpty(minHadoopSinkVersion)) {

ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java

@@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableMap;
  * done for Stack Upgrades.
  */
 public class CheckDescription {
-  public static CheckDescription CLIENT_RETRY = new CheckDescription("CLIENT_RETRY",
+  public static final CheckDescription CLIENT_RETRY = new CheckDescription("CLIENT_RETRY",
     PrereqCheckType.SERVICE,
     "Client Retry Properties",
     new ImmutableMap.Builder<String, String>()
@@ -39,28 +39,28 @@ public class CheckDescription {
       .put(ClientRetryPropertyCheck.OOZIE_CLIENT_RETRY_MISSING_KEY,
           "The oozie-env.sh script must contain a retry count such as export OOZIE_CLIENT_OPTS=\"${OOZIE_CLIENT_OPTS} -Doozie.connection.retry.count=5\"").build());
 
-  public static CheckDescription HOSTS_HEARTBEAT = new CheckDescription("HOSTS_HEARTBEAT",
+  public static final CheckDescription HOSTS_HEARTBEAT = new CheckDescription("HOSTS_HEARTBEAT",
     PrereqCheckType.HOST,
     "All hosts must be communicating with Ambari. Hosts which are not reachable should be placed in Maintenance Mode.",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "There are hosts which are not communicating with Ambari.").build());
 
-  public static CheckDescription HEALTH = new CheckDescription("HEALTH",
+  public static final CheckDescription HEALTH = new CheckDescription("HEALTH",
     PrereqCheckType.CLUSTER,
     "Cluster Health",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The following issues have been detected on this cluster and should be addressed before upgrading: %s").build());
 
-  public static CheckDescription SERVICE_CHECK = new CheckDescription("SERVICE_CHECK",
+  public static final CheckDescription SERVICE_CHECK = new CheckDescription("SERVICE_CHECK",
     PrereqCheckType.SERVICE,
     "Last Service Check should be more recent than the last configuration change for the given service",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The following service configurations have been updated and their Service Checks should be run again: %s").build());
 
-  public static CheckDescription HOSTS_MAINTENANCE_MODE = new CheckDescription("HOSTS_MAINTENANCE_MODE",
+  public static final CheckDescription HOSTS_MAINTENANCE_MODE = new CheckDescription("HOSTS_MAINTENANCE_MODE",
     PrereqCheckType.HOST,
     "Hosts in Maintenance Mode will be excluded from the upgrade.",
     new ImmutableMap.Builder<String, String>()
@@ -69,7 +69,7 @@ public class CheckDescription {
       .put(HostMaintenanceModeCheck.KEY_CANNOT_START_HOST_ORDERED,
           "The following hosts cannot be in Maintenance Mode: {{fails}}.").build());
 
-  public static CheckDescription HOSTS_MASTER_MAINTENANCE = new CheckDescription("HOSTS_MASTER_MAINTENANCE",
+  public static final CheckDescription HOSTS_MASTER_MAINTENANCE = new CheckDescription("HOSTS_MASTER_MAINTENANCE",
     PrereqCheckType.HOST,
     "Hosts in Maintenance Mode must not have any master components",
     new ImmutableMap.Builder<String, String>()
@@ -80,34 +80,34 @@ public class CheckDescription {
       .put(HostsMasterMaintenanceCheck.KEY_NO_UPGRADE_PACK,
           "Could not find upgrade pack named %s.").build());
 
-  public static CheckDescription HOSTS_REPOSITORY_VERSION = new CheckDescription("HOSTS_REPOSITORY_VERSION",
+  public static final CheckDescription HOSTS_REPOSITORY_VERSION = new CheckDescription("HOSTS_REPOSITORY_VERSION",
     PrereqCheckType.HOST,
     "All hosts should have target version installed",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The following hosts must have version {{version}} installed: {{fails}}.").build());
 
-  public static CheckDescription SECONDARY_NAMENODE_MUST_BE_DELETED = new CheckDescription("SECONDARY_NAMENODE_MUST_BE_DELETED",
+  public static final CheckDescription SECONDARY_NAMENODE_MUST_BE_DELETED = new CheckDescription("SECONDARY_NAMENODE_MUST_BE_DELETED",
     PrereqCheckType.HOST,
     "The SNameNode component must be deleted from all hosts",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT, "The SNameNode component must be deleted from host: %s.").build());
 
-  public static CheckDescription SERVICES_HIVE_MULTIPLE_METASTORES = new CheckDescription("SERVICES_HIVE_MULTIPLE_METASTORES",
+  public static final CheckDescription SERVICES_HIVE_MULTIPLE_METASTORES = new CheckDescription("SERVICES_HIVE_MULTIPLE_METASTORES",
     PrereqCheckType.SERVICE,
     "Hive Metastore Availability",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "Multiple Hive Metastore instances are recommended for Rolling Upgrade. This ensures that there is at least one Metastore running during the upgrade process.").build());
 
-  public static CheckDescription SERVICES_MAINTENANCE_MODE = new CheckDescription("SERVICES_MAINTENANCE_MODE",
+  public static final CheckDescription SERVICES_MAINTENANCE_MODE = new CheckDescription("SERVICES_MAINTENANCE_MODE",
     PrereqCheckType.SERVICE,
     "No services can be in Maintenance Mode",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The following Services must not be in Maintenance Mode: {{fails}}.").build());
 
-  public static CheckDescription SERVICES_MR_DISTRIBUTED_CACHE = new CheckDescription("SERVICES_MR_DISTRIBUTED_CACHE",
+  public static final CheckDescription SERVICES_MR_DISTRIBUTED_CACHE = new CheckDescription("SERVICES_MR_DISTRIBUTED_CACHE",
     PrereqCheckType.SERVICE,
     "MapReduce should reference Hadoop libraries from the distributed cache in HDFS",
     new ImmutableMap.Builder<String, String>()
@@ -118,21 +118,21 @@ public class CheckDescription {
       .put(ServicesMapReduceDistributedCacheCheck.KEY_NOT_DFS,
           "The mapred-site.xml property mapreduce.application.framework.path or the core-site.xml property fs.defaultFS should point to *dfs:/ url.").build());
 
-  public static CheckDescription SERVICES_NAMENODE_HA = new CheckDescription("SERVICES_NAMENODE_HA",
+  public static final CheckDescription SERVICES_NAMENODE_HA = new CheckDescription("SERVICES_NAMENODE_HA",
     PrereqCheckType.SERVICE,
     "NameNode High Availability must be enabled",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "NameNode High Availability is not enabled. Verify that dfs.internal.nameservices property is present in hdfs-site.xml.").build());
 
-  public static CheckDescription SERVICES_NAMENODE_TRUNCATE = new CheckDescription("SERVICES_NAMENODE_TRUNCATE",
+  public static final CheckDescription SERVICES_NAMENODE_TRUNCATE = new CheckDescription("SERVICES_NAMENODE_TRUNCATE",
     PrereqCheckType.SERVICE,
     "NameNode Truncate must not be allowed",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "NameNode Truncate is allowed. Verify that dfs.allow.truncate is set to 'false' in hdfs-site.xml.").build());
 
-  public static CheckDescription SERVICES_TEZ_DISTRIBUTED_CACHE = new CheckDescription("SERVICES_TEZ_DISTRIBUTED_CACHE",
+  public static final CheckDescription SERVICES_TEZ_DISTRIBUTED_CACHE = new CheckDescription("SERVICES_TEZ_DISTRIBUTED_CACHE",
     PrereqCheckType.SERVICE,
     "Tez should reference Hadoop libraries from the distributed cache in HDFS",
     new ImmutableMap.Builder<String, String>()
@@ -147,56 +147,56 @@ public class CheckDescription {
       .put(ServicesTezDistributedCacheCheck.KEY_USE_HADOOP_LIBS_FALSE,
           "The tez-site.xml property tez.use.cluster.hadoop-libs should be set to false.").build());
 
-  public static CheckDescription SERVICES_UP = new CheckDescription("SERVICES_UP",
+  public static final CheckDescription SERVICES_UP = new CheckDescription("SERVICES_UP",
     PrereqCheckType.SERVICE,
     "All services must be started",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The following Services must be started: {{fails}}. Try to do a Stop & Start in case they were started outside of Ambari.").build());
 
-  public static CheckDescription COMPONENTS_INSTALLATION = new CheckDescription("COMPONENTS_INSTALLATION",
+  public static final CheckDescription COMPONENTS_INSTALLATION = new CheckDescription("COMPONENTS_INSTALLATION",
     PrereqCheckType.SERVICE,
     "All service components must be installed",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The following Services must be reinstalled: {{fails}}. Try to reinstall the service components in INSTALL_FAILED state.").build());
 
-  public static CheckDescription PREVIOUS_UPGRADE_COMPLETED = new CheckDescription("PREVIOUS_UPGRADE_COMPLETED",
+  public static final CheckDescription PREVIOUS_UPGRADE_COMPLETED = new CheckDescription("PREVIOUS_UPGRADE_COMPLETED",
     PrereqCheckType.CLUSTER,
     "A previous upgrade did not complete.",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The last upgrade attempt did not complete. {{fails}}").build());
 
-  public static CheckDescription INSTALL_PACKAGES_CHECK = new CheckDescription("INSTALL_PACKAGES_CHECK",
+  public static final CheckDescription INSTALL_PACKAGES_CHECK = new CheckDescription("INSTALL_PACKAGES_CHECK",
     PrereqCheckType.CLUSTER,
     "Install packages must be re-run",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "Re-run Install Packages before starting upgrade").build());
 
-  public static CheckDescription SERVICES_YARN_WP = new CheckDescription("SERVICES_YARN_WP",
+  public static final CheckDescription SERVICES_YARN_WP = new CheckDescription("SERVICES_YARN_WP",
     PrereqCheckType.SERVICE,
     "YARN work preserving restart should be enabled",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "YARN should have work preserving restart enabled. The yarn-site.xml property yarn.resourcemanager.work-preserving-recovery.enabled property should be set to true.").build());
 
-  public static CheckDescription SERVICES_YARN_RM_HA = new CheckDescription("SERVICES_YARN_RM_HA",
+  public static final CheckDescription SERVICES_YARN_RM_HA = new CheckDescription("SERVICES_YARN_RM_HA",
     PrereqCheckType.SERVICE,
     "YARN ResourceManager High Availability is not enabled.",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "YARN ResourceManager HA should be enabled to prevent a disruption in service during the upgrade").build());
 
-  public static CheckDescription SERVICES_YARN_TIMELINE_ST = new CheckDescription("SERVICES_YARN_TIMELINE_ST",
+  public static final CheckDescription SERVICES_YARN_TIMELINE_ST = new CheckDescription("SERVICES_YARN_TIMELINE_ST",
     PrereqCheckType.SERVICE,
     "YARN Timeline state preserving restart should be enabled",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "YARN should have state preserving restart enabled for the Timeline server. The yarn-site.xml property yarn.timeline-service.recovery.enabled should be set to true.").build());
 
-  public static CheckDescription SERVICES_MR2_JOBHISTORY_ST = new CheckDescription("SERVICES_MR2_JOBHISTORY_ST",
+  public static final CheckDescription SERVICES_MR2_JOBHISTORY_ST = new CheckDescription("SERVICES_MR2_JOBHISTORY_ST",
     PrereqCheckType.SERVICE,
     "MapReduce2 JobHistory recovery should be enabled",
     new ImmutableMap.Builder<String, String>()
@@ -207,7 +207,7 @@ public class CheckDescription {
       .put(MapReduce2JobHistoryStatePreservingCheck.MAPREDUCE2_JOBHISTORY_RECOVERY_STORE_LEVELDB_PATH_KEY,
           "MapReduce2 should have recovery enabled for the JobHistory server. The mapred-site.xml property mapreduce.jobhistory.recovery.store.leveldb.path should be set. Please note that \"mapreduce.jobhistory.recovery.store.leveldb.path\" should be on a mount with ~3 GB of free space.").build());
 
-  public static CheckDescription SERVICES_HIVE_DYNAMIC_SERVICE_DISCOVERY = new CheckDescription("SERVICES_HIVE_DYNAMIC_SERVICE_DISCOVERY",
+  public static final CheckDescription SERVICES_HIVE_DYNAMIC_SERVICE_DISCOVERY = new CheckDescription("SERVICES_HIVE_DYNAMIC_SERVICE_DISCOVERY",
     PrereqCheckType.SERVICE,
     "Hive Dynamic Service Discovery",
     new ImmutableMap.Builder<String, String>()
@@ -218,7 +218,7 @@ public class CheckDescription {
       .put(HiveDynamicServiceDiscoveryCheck.HIVE_DYNAMIC_SERVICE_ZK_NAMESPACE_KEY,
           "The hive-site.xml property hive.server2.zookeeper.namespace should be set to the value for the root namespace on ZooKeeper.").build());
 
-  public static CheckDescription AMS_HADOOP_SINK_VERSION_COMPATIBILITY = new CheckDescription("AMS_HADOOP_SINK_VERSION_COMPATIBILITY",
+  public static final CheckDescription AMS_HADOOP_SINK_VERSION_COMPATIBILITY = new CheckDescription("AMS_HADOOP_SINK_VERSION_COMPATIBILITY",
     PrereqCheckType.HOST,
     "Ambari Metrics Hadoop Sinks need to be compatible with the stack version. This check ensures that compatibility.",
     new ImmutableMap.Builder<String, String>().put(AbstractCheckDescriptor.DEFAULT,"Hadoop Sink version check failed. " +
@@ -226,14 +226,14 @@ public class CheckDescription {
       .put(AmbariMetricsHadoopSinkVersionCompatibilityCheck.HADOOP_SINK_VERSION_NOT_SPECIFIED, "Hadoop Sink version for pre-check not specified. " +
         "Please use 'min-hadoop-sink-version' property in upgrade pack to specify min hadoop sink version").build());
 
-  public static CheckDescription CONFIG_MERGE = new CheckDescription("CONFIG_MERGE",
+  public static final CheckDescription CONFIG_MERGE = new CheckDescription("CONFIG_MERGE",
     PrereqCheckType.CLUSTER,
     "Configuration Merge Check",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "The following config types will have values overwritten: %s").build());
 
-  public static CheckDescription HARDCODED_STACK_VERSION_PROPERTIES_CHECK = new CheckDescription("HARDCODED_STACK_VERSION_PROPERTIES_CHECK",
+  public static final CheckDescription HARDCODED_STACK_VERSION_PROPERTIES_CHECK = new CheckDescription("HARDCODED_STACK_VERSION_PROPERTIES_CHECK",
     PrereqCheckType.CLUSTER,
     "Found hardcoded stack version in property value.",
     new ImmutableMap.Builder<String, String>()
@@ -241,14 +241,14 @@ public class CheckDescription {
           "Some properties seem to contain hardcoded stack version string \"%s\"." +
           " That is a potential problem when doing stack update.").build());
 
-  public static CheckDescription VERSION_MISMATCH = new CheckDescription("VERSION_MISMATCH",
+  public static final CheckDescription VERSION_MISMATCH = new CheckDescription("VERSION_MISMATCH",
     PrereqCheckType.HOST,
     "All components must be reporting the expected version",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "There are components which are not reporting the expected stack version: \n%s").build());
 
-  public static CheckDescription SERVICES_RANGER_PASSWORD_VERIFY = new CheckDescription("SERVICES_RANGER_PASSWORD_VERIFY",
+  public static final CheckDescription SERVICES_RANGER_PASSWORD_VERIFY = new CheckDescription("SERVICES_RANGER_PASSWORD_VERIFY",
     PrereqCheckType.SERVICE,
     "Verify Ambari and Ranger Password Synchronization",
     new ImmutableMap.Builder<String, String>()
@@ -267,7 +267,7 @@ public class CheckDescription {
       .put(RangerPasswordCheck.KEY_RANGER_CONFIG_MISSING,
           "Could not check credentials.  Missing property %s/%s").build());
 
-  public static CheckDescription ATLAS_SERVICE_PRESENCE_CHECK = new CheckDescription("ATLAS_SERVICE_PRESENCE_CHECK",
+  public static final CheckDescription ATLAS_SERVICE_PRESENCE_CHECK = new CheckDescription("ATLAS_SERVICE_PRESENCE_CHECK",
     PrereqCheckType.SERVICE,
     "Atlas Is Not Supported For Upgrades",
     new ImmutableMap.Builder<String, String>()
@@ -276,7 +276,7 @@ public class CheckDescription {
           "This service does not support upgrades and must be removed before the upgrade can continue. " +
           "After upgrading, Atlas can be reinstalled").build());
 
-  public static CheckDescription SERVICE_PRESENCE_CHECK = new CheckDescription("SERVICE_PRESENCE_CHECK",
+  public static final CheckDescription SERVICE_PRESENCE_CHECK = new CheckDescription("SERVICE_PRESENCE_CHECK",
     PrereqCheckType.SERVICE,
     "Service Is Not Supported For Upgrades",
     new ImmutableMap.Builder<String, String>()
@@ -288,7 +288,7 @@ public class CheckDescription {
           "The %s service is currently installed on the cluster. " +
           "This service is removed from the new release and must be removed before the upgrade can continue.").build());
 
-  public static CheckDescription RANGER_SERVICE_AUDIT_DB_CHECK = new CheckDescription("RANGER_SERVICE_AUDIT_DB_CHECK",
+  public static final CheckDescription RANGER_SERVICE_AUDIT_DB_CHECK = new CheckDescription("RANGER_SERVICE_AUDIT_DB_CHECK",
     PrereqCheckType.SERVICE,
     "Remove the Ranger Audit to Database Capability",
     new ImmutableMap.Builder<String, String>()
@@ -296,28 +296,28 @@ public class CheckDescription {
           "After upgrading, Ranger will no longer support the Audit to Database feature. Instead, Ranger will audit to Solr. " +
           "To migrate the existing audit logs to Solr, follow the steps in Apache Ranger documention for 0.6 release.").build());
 
-  public static CheckDescription KAFKA_KERBEROS_CHECK = new CheckDescription("KAFKA_KERBEROS_CHECK",
+  public static final CheckDescription KAFKA_KERBEROS_CHECK = new CheckDescription("KAFKA_KERBEROS_CHECK",
     PrereqCheckType.SERVICE,
     "Kafka upgrade on Kerberized cluster",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "Kafka is currently not Kerberized, but your cluster is. After upgrading, Kafka will automatically be Kerberized for you.").build());
 
-  public static CheckDescription SERVICES_HIVE_ROLLING_WARNING = new CheckDescription("SERVICES_HIVE_ROLLING_WARNING",
+  public static final CheckDescription SERVICES_HIVE_ROLLING_WARNING = new CheckDescription("SERVICES_HIVE_ROLLING_WARNING",
     PrereqCheckType.SERVICE,
     "HiveServer2 Downtime",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "HiveServer2 does not currently support rolling upgrades. HiveServer2 will be upgraded, however existing queries which have not completed will fail and need to be resubmitted after HiveServer2 has been upgraded.").build());
 
-  public static CheckDescription SERVICES_STORM_ROLLING_WARNING = new CheckDescription("SERVICES_STORM_ROLLING_WARNING",
+  public static final CheckDescription SERVICES_STORM_ROLLING_WARNING = new CheckDescription("SERVICES_STORM_ROLLING_WARNING",
     PrereqCheckType.SERVICE,
     "Storm Downtime During Upgrade",
     new ImmutableMap.Builder<String, String>()
       .put(AbstractCheckDescriptor.DEFAULT,
           "Storm does not support rolling upgrades on this version of the stack. If you proceed, you will be required to stop all running topologies before Storm is restarted.").build());
 
-  public static CheckDescription AUTO_START_DISABLED = new CheckDescription("AUTO_START_DISABLED",
+  public static final CheckDescription AUTO_START_DISABLED = new CheckDescription("AUTO_START_DISABLED",
     PrereqCheckType.CLUSTER,
     "Auto-Start Disabled Check",
     new ImmutableMap.Builder<String, String>()
@@ -325,7 +325,7 @@ public class CheckDescription {
         "Auto Start must be disabled before performing an Upgrade. To disable Auto Start, navigate to " +
           "Admin > Service Auto Start. Turn the toggle switch off to Disabled and hit Save.").build());
 
-  public static CheckDescription RANGER_SSL_CONFIG_CHECK = new CheckDescription("RANGER_SSL_CONFIG_CHECK",
+  public static final CheckDescription RANGER_SSL_CONFIG_CHECK = new CheckDescription("RANGER_SSL_CONFIG_CHECK",
     PrereqCheckType.SERVICE,
     "Change Ranger SSL configuration path for Keystore and Truststore.",
     new ImmutableMap.Builder<String, String>()
@@ -333,7 +333,7 @@ public class CheckDescription {
         "As Ranger is SSL enabled, Ranger SSL configurations will need to be changed from default value of /etc/ranger/*/conf folder to /etc/ranger/security. " +
         "Since the certificates/keystores/truststores in this path may affect the upgrade/downgrade process, it is recommended to manually move the certificates/keystores/truststores out of the conf folders and change the appropriate config values before proceeding.").build());
 
-  public static CheckDescription LZO_CONFIG_CHECK = new CheckDescription("LZO_CONFIG_CHECK",
+  public static final CheckDescription LZO_CONFIG_CHECK = new CheckDescription("LZO_CONFIG_CHECK",
       PrereqCheckType.CLUSTER,
       "LZO Codec Check",
       new ImmutableMap.Builder<String, String>()
@@ -342,14 +342,14 @@ public class CheckDescription {
                   "If any hosts require LZO, it should be installed before starting the upgrade. " +
                   "Consult Ambari documentation for instructions on how to do this.").build());
 
-  public static CheckDescription JAVA_VERSION = new CheckDescription("JAVA_VERSION",
+  public static final CheckDescription JAVA_VERSION = new CheckDescription("JAVA_VERSION",
       PrereqCheckType.CLUSTER,
       "Verify Java version requirement",
       new ImmutableMap.Builder<String, String>()
         .put(AbstractCheckDescriptor.DEFAULT, "Ambari requires JDK with minimum version %s. Reconfigure Ambari with a JDK that meets the version requirement.")
           .build());
 
-  public static CheckDescription COMPONENTS_EXIST_IN_TARGET_REPO = new CheckDescription("COMPONENTS_EXIST_IN_TARGET_REPO",
+  public static final CheckDescription COMPONENTS_EXIST_IN_TARGET_REPO = new CheckDescription("COMPONENTS_EXIST_IN_TARGET_REPO",
     PrereqCheckType.CLUSTER,
     "Check installed services which are not supported in the installed stack",
     new ImmutableMap.Builder<String, String>()
@@ -358,7 +358,7 @@ public class CheckDescription {
       .build()
     );
 
-  public static CheckDescription DRUID_HA_WARNING = new CheckDescription(
+  public static final CheckDescription DRUID_HA_WARNING = new CheckDescription(
       "DRUID_HA",
       PrereqCheckType.SERVICE,
       "Druid Downtime During Upgrade",
@@ -370,7 +370,7 @@ public class CheckDescription {
           .build()
   );
 
-  public static CheckDescription VALID_SERVICES_INCLUDED_IN_REPOSITORY = new CheckDescription("VALID_SERVICES_INCLUDED_IN_REPOSITORY",
+  public static final CheckDescription VALID_SERVICES_INCLUDED_IN_REPOSITORY = new CheckDescription("VALID_SERVICES_INCLUDED_IN_REPOSITORY",
       PrereqCheckType.CLUSTER,
       "The repository is missing services which are required",
       new ImmutableMap.Builder<String, String>()
@@ -378,7 +378,7 @@ public class CheckDescription {
             "The following services are included in the upgrade but the repository is missing their dependencies:\n%s").build());
 
 
-  public static CheckDescription ATLAS_MIGRATION_PROPERTY_CHECK = new CheckDescription("ATLAS_MIGRATION_PROPERTY_CHECK",
+  public static final CheckDescription ATLAS_MIGRATION_PROPERTY_CHECK = new CheckDescription("ATLAS_MIGRATION_PROPERTY_CHECK",
     PrereqCheckType.SERVICE, "Check for Atlas Migration Property before upgrade.",
       new ImmutableMap.Builder<String,String>().put(AbstractCheckDescriptor.DEFAULT,
         "The property atlas.migration.data.filename is missing from application-properties. Do not use atlas conf path ie /etc/atlas/conf as the value." +
@@ -386,7 +386,7 @@ public class CheckDescription {
         "Hence need to migrate existing data to newer formats post upgrade. " +
         "To migrate existing data, Kindly refer and follow Apache Atlas documentation for 1.0 release.").build());
 
-  public static CheckDescription KERBEROS_ADMIN_CREDENTIAL_CHECK = new CheckDescription("KERBEROS_ADMIN_CREDENTIAL_CHECK",
+  public static final CheckDescription KERBEROS_ADMIN_CREDENTIAL_CHECK = new CheckDescription("KERBEROS_ADMIN_CREDENTIAL_CHECK",
       PrereqCheckType.CLUSTER,
       "The KDC administrator credentials need to be stored in Ambari persisted credential store.",
       new ImmutableMap.Builder<String, String>()

ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java

@@ -59,7 +59,6 @@ import org.apache.ambari.server.orm.entities.ClusterConfigEntity;
 import org.apache.ambari.server.orm.entities.HostComponentDesiredStateEntity;
 import org.apache.ambari.server.orm.entities.HostComponentStateEntity;
 import org.apache.ambari.server.orm.entities.MetainfoEntity;
-import org.apache.ambari.server.orm.entities.ServiceComponentDesiredStateEntity;
 import org.apache.ambari.server.security.authorization.AuthorizationException;
 import org.apache.ambari.server.state.ClientConfigFileDefinition;
 import org.apache.ambari.server.state.Cluster;
@@ -671,8 +670,6 @@ public class DatabaseConsistencyCheckHelper {
     }
 
     for (HostComponentDesiredStateEntity hostComponentDesiredStateEntity : missedHostComponentDesiredStates) {
-      ServiceComponentDesiredStateEntity serviceComponentDesiredStateEntity = hostComponentDesiredStateEntity.getServiceComponentDesiredStateEntity();
-
       HostComponentStateEntity stateEntity = new HostComponentStateEntity();
       stateEntity.setClusterId(hostComponentDesiredStateEntity.getClusterId());
       stateEntity.setComponentName(hostComponentDesiredStateEntity.getComponentName());
@@ -820,8 +817,6 @@ public class DatabaseConsistencyCheckHelper {
     ClusterDAO clusterDAO = injector.getInstance(ClusterDAO.class);
 
     Clusters clusters = injector.getInstance(Clusters.class);
-    Map<String, Cluster> clusterMap = clusters.getClusters();
-
 
     Multimap<String, String> clusterConfigTypeMap = HashMultimap.create();
     ResultSet rs = null;

ambari-server/src/main/java/org/apache/ambari/server/checks/MpackInstallChecker.java

@@ -33,7 +33,6 @@ import org.apache.ambari.server.orm.DBAccessor;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;
-import org.apache.commons.cli.HelpFormatter;
 import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import org.slf4j.Logger;
@@ -71,7 +70,6 @@ public class MpackInstallChecker {
 
   private static MpackContext processArguments(String... args) {
     CommandLineParser cmdLineParser = new DefaultParser();
-    HelpFormatter formatter = new HelpFormatter();
     MpackContext ctx = null;
 
     try {

ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java

@@ -3083,7 +3083,9 @@ public class Configuration {
         LOG.error("Unable to write data into " + ambariUpgradeConfigUpdatesFilePath, e);
       } finally {
         try {
-          fileWriter.close();
+          if (fileWriter != null) {
+            fileWriter.close();
+          }
         } catch (IOException e) {
           LOG.error("Unable to close file " + ambariUpgradeConfigUpdatesFilePath, e);
         }
@@ -3143,14 +3145,9 @@ public class Configuration {
   public Map<String, String> getDatabaseConnectorNames() {
     File file = getConfigFile();
     Long currentConfigLastModifiedDate = file.lastModified();
-    Properties properties = null;
     if (currentConfigLastModifiedDate.longValue() != configLastModifiedDateForCustomJDBC.longValue()) {
       LOG.info("Ambari properties config file changed.");
-      if (configLastModifiedDateForCustomJDBC != null) {
-        properties = readConfigFile();
-      } else {
-        properties = this.properties;
-      }
+      Properties properties = readConfigFile();
 
       for (String propertyName : dbConnectorPropertyNames) {
         String propertyValue = properties.getProperty(propertyName);
@@ -3172,14 +3169,9 @@ public class Configuration {
   public Map<String, String> getPreviousDatabaseConnectorNames() {
     File file = getConfigFile();
     Long currentConfigLastModifiedDate = file.lastModified();
-    Properties properties = null;
     if (currentConfigLastModifiedDate.longValue() != configLastModifiedDateForCustomJDBCToRemove.longValue()) {
       LOG.info("Ambari properties config file changed.");
-      if (configLastModifiedDateForCustomJDBCToRemove != null) {
-        properties = readConfigFile();
-      } else {
-        properties = this.properties;
-      }
+      Properties properties = readConfigFile();
 
       for (String propertyName : dbConnectorPropertyNames) {
         propertyName = "previous." + propertyName;
@@ -3205,7 +3197,7 @@ public class Configuration {
   private JsonObject readFileToJSON (String file) {
 
     // Read from File to String
-    JsonObject jsonObject = new JsonObject();
+    JsonObject jsonObject;
 
     try {
       JsonParser parser = new JsonParser();
@@ -4300,7 +4292,7 @@ public class Configuration {
     long value = SERVER_EC_CACHE_SIZE.getDefaultValue();
     if (stringValue != null) {
       try {
-        value = Long.valueOf(stringValue);
+        value = Long.parseLong(stringValue);
       } catch (NumberFormatException ignored) {
       }
 
@@ -4343,7 +4335,7 @@ public class Configuration {
     long value = SERVER_HRC_STATUS_SUMMARY_CACHE_SIZE.getDefaultValue();
     if (stringValue != null) {
       try {
-        value = Long.valueOf(stringValue);
+        value = Long.parseLong(stringValue);
       }
       catch (NumberFormatException ignored) {
       }
@@ -4364,7 +4356,7 @@ public class Configuration {
     long value = SERVER_HRC_STATUS_SUMMARY_CACHE_EXPIRY_DURATION.getDefaultValue();
     if (stringValue != null) {
       try {
-        value = Long.valueOf(stringValue);
+        value = Long.parseLong(stringValue);
       }
       catch (NumberFormatException ignored) {
       }
@@ -4455,10 +4447,10 @@ public class Configuration {
   public Long getExecutionSchedulerWait() {
 
     String stringValue = getProperty(EXECUTION_SCHEDULER_WAIT);
-    Long sleepTime = EXECUTION_SCHEDULER_WAIT.getDefaultValue();
+    long sleepTime = EXECUTION_SCHEDULER_WAIT.getDefaultValue();
     if (stringValue != null) {
       try {
-        sleepTime = Long.valueOf(stringValue);
+        sleepTime = Long.parseLong(stringValue);
       } catch (NumberFormatException ignored) {
         LOG.warn("Value of {} ({}) should be a number, " +
             "falling back to default value ({})", EXECUTION_SCHEDULER_WAIT.getKey(), stringValue,
@@ -5224,7 +5216,7 @@ public class Configuration {
   public int getOperationsRetryAttempts() {
     final int RETRY_ATTEMPTS_LIMIT = 10;
     String property = getProperty(OPERATIONS_RETRY_ATTEMPTS);
-    Integer attempts = Integer.valueOf(property);
+    int attempts = Integer.parseInt(property);
     if (attempts < 0) {
       LOG.warn("Invalid operations retry attempts number ({}), should be [0,{}]. Value reset to default {}",
           attempts, RETRY_ATTEMPTS_LIMIT, OPERATIONS_RETRY_ATTEMPTS.getDefaultValue());
@@ -5980,11 +5972,11 @@ public class Configuration {
   }
 
   public int getKerberosOperationRetries() {
-    return Integer.valueOf(getProperty(KERBEROS_OPERATION_RETRIES));
+    return Integer.parseInt(getProperty(KERBEROS_OPERATION_RETRIES));
   }
 
   public int getKerberosOperationRetryTimeout() {
-    return Integer.valueOf(getProperty(KERBEROS_OPERATION_RETRY_TIMEOUT));
+    return Integer.parseInt(getProperty(KERBEROS_OPERATION_RETRY_TIMEOUT));
   }
 
   public boolean validateKerberosOperationSSLCertTrust() {

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java

@@ -98,6 +98,7 @@ import org.apache.commons.lang.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.gson.Gson;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
@@ -113,14 +114,12 @@ public class AmbariCustomCommandExecutionHelper {
       AmbariCustomCommandExecutionHelper.class);
 
   // TODO: Remove the hard-coded mapping when stack definition indicates which slave types can be decommissioned
-  public static final Map<String, String> masterToSlaveMappingForDecom = new HashMap<>();
-
-  static {
-    masterToSlaveMappingForDecom.put("NAMENODE", "DATANODE");
-    masterToSlaveMappingForDecom.put("RESOURCEMANAGER", "NODEMANAGER");
-    masterToSlaveMappingForDecom.put("HBASE_MASTER", "HBASE_REGIONSERVER");
-    masterToSlaveMappingForDecom.put("JOBTRACKER", "TASKTRACKER");
-  }
+  static final Map<String, String> masterToSlaveMappingForDecom = ImmutableMap.<String, String>builder()
+    .put("NAMENODE", "DATANODE")
+    .put("RESOURCEMANAGER", "NODEMANAGER")
+    .put("HBASE_MASTER", "HBASE_REGIONSERVER")
+    .put("JOBTRACKER", "TASKTRACKER")
+    .build();
 
   public final static String DECOM_INCLUDED_HOSTS = "included_hosts";
   public final static String DECOM_EXCLUDED_HOSTS = "excluded_hosts";
@@ -1243,10 +1242,6 @@ public class AmbariCustomCommandExecutionHelper {
       }
 
       clusterHostInfoJson = StageUtils.getGson().toJson(clusterHostInfo);
-
-      if (null == stackId && null != cluster) {
-        stackId = cluster.getDesiredStackVersion();
-      }
     }
 
     String hostParamsStageJson = StageUtils.getGson().toJson(hostParamsStage);

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java

@@ -3246,10 +3246,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
   public ExecutionCommand getExecutionCommand(Cluster cluster,
                                               ServiceComponentHost scHost,
                                               RoleCommand roleCommand) throws AmbariException {
-    Map<String, Set<String>> clusterHostInfo = StageUtils.getClusterHostInfo(cluster);
-    String clusterHostInfoJson = StageUtils.getGson().toJson(clusterHostInfo);
-
-
     Map<String, String> hostParamsCmd = customCommandExecutionHelper.createDefaultHostParams(
         cluster, scHost.getServiceComponent().getDesiredStackId());
 
@@ -4902,7 +4898,6 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
       Set<RootServiceComponentRequest> requests) throws AmbariException {
     Set<RootServiceComponentResponse> response = new HashSet<>();
     for (RootServiceComponentRequest request : requests) {
-      String serviceName  = request.getServiceName();
       try {
         Set<RootServiceComponentResponse> rootServiceComponents = getRootServiceComponents(request);
         response.addAll(rootServiceComponents);
@@ -5462,7 +5457,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     }
     ExtensionLinkEntity linkEntity = null;
     try {
-      linkEntity = linkDAO.findById(new Long(request.getLinkId()));
+      linkEntity = linkDAO.findById(Long.parseLong(request.getLinkId()));
     } catch (RollbackException e) {
       throw new AmbariException("Unable to find extension link"
             + ", linkId=" + request.getLinkId(), e);
@@ -5539,7 +5534,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     }
     ExtensionLinkEntity linkEntity = null;
     try {
-      linkEntity = linkDAO.findById(new Long(request.getLinkId()));
+      linkEntity = linkDAO.findById(Long.parseLong(request.getLinkId()));
     } catch (RollbackException e) {
       throw new AmbariException("Unable to find extension link"
             + ", linkId=" + request.getLinkId(), e);

ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java

@@ -76,7 +76,6 @@ public class AmbariManagementHelper {
 
     try {
       linkDAO.create(linkEntity);
-      linkEntity = linkDAO.merge(linkEntity);
     } catch (RollbackException e) {
       String message = "Unable to create extension link";
       LOG.debug(message, e);

ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java

@@ -342,7 +342,7 @@ public class AuthToLocalBuilder implements Cloneable {
       if (!m.matches()) {
         throw new IllegalArgumentException("Invalid rule: " + rule);
       }
-      int expectedComponentCount = Integer.valueOf(m.group(1));
+      int expectedComponentCount = Integer.parseInt(m.group(1));
       String matchPattern = m.group(2);
       String optionalPatternRealm = m.group(3);
       String matchingRegexp = m.group(4);

ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java

@@ -140,9 +140,6 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
-import com.google.gson.JsonArray;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
@@ -4019,27 +4016,6 @@ public class KerberosHelperImpl implements KerberosHelper {
     }
   }
 
-  private JsonObject serviceFilterToJsonObject(Map<String, ? extends Collection<String>> serviceComponentFilter) {
-    Object test = StageUtils.getGson().toJson(serviceComponentFilter);
-    if (serviceComponentFilter != null) {
-      JsonObject serviceFilter = new JsonObject();
-      for (Map.Entry<String, ? extends Collection<String>> filterEntry : serviceComponentFilter.entrySet()) {
-        if (filterEntry.getValue() != null) {
-          JsonArray components = new JsonArray();
-          for (String component : filterEntry.getValue()) {
-            components.add(new JsonPrimitive(component));
-          }
-          serviceFilter.add(filterEntry.getKey(), components);
-        } else {
-          serviceFilter.add(filterEntry.getKey(), null);
-        }
-
-      }
-      return serviceFilter;
-    }
-    return null;
-  }
-
   /**
    * CreatePrincipalsAndKeytabsHandler is an implementation of the Handler interface used to create
    * principals and keytabs and distribute them throughout the cluster.  This is similar to enabling

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java

@@ -70,7 +70,7 @@ public abstract class AbstractResourceProvider extends BaseProvider implements R
 
   private static final Logger LOG = LoggerFactory.getLogger(AbstractResourceProvider.class);
   protected final static String PROPERTIES_ATTRIBUTES_REGEX = "properties_attributes/[a-zA-Z][a-zA-Z._-]*$";
-  public static Pattern propertiesAttributesPattern = Pattern.compile(".*/" + PROPERTIES_ATTRIBUTES_REGEX);
+  private static final Pattern propertiesAttributesPattern = Pattern.compile(".*/" + PROPERTIES_ATTRIBUTES_REGEX);
 
 
   // ----- Constructors ------------------------------------------------------

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java

@@ -72,14 +72,14 @@ public class ActionResourceProvider extends AbstractControllerResourceProvider {
   /**
    * The key property ids for a Action resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Action, ACTION_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a Action resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       ACTION_NAME_PROPERTY_ID,
       ACTION_TYPE_PROPERTY_ID,
       INPUTS_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java

@@ -53,6 +53,8 @@ import org.apache.ambari.server.security.authorization.ResourceType;
 import org.apache.ambari.server.security.authorization.RoleAuthorization;
 import org.apache.commons.lang3.StringUtils;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.google.inject.Inject;
@@ -77,28 +79,28 @@ public class ActiveWidgetLayoutResourceProvider extends AbstractControllerResour
   public static final String ID = "id";
 
   @SuppressWarnings("serial")
-  private static Set<String> pkPropertyIds = new HashSet<>();
+  private static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+    .add(WIDGETLAYOUT_ID_PROPERTY_ID)
+    .build();
 
   @SuppressWarnings("serial")
-  public static Set<String> propertyIds = new HashSet<>();
+  public static final Set<String> propertyIds = ImmutableSet.<String>builder()
+    .add(WIDGETLAYOUT_ID_PROPERTY_ID)
+    .add(WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID)
+    .add(WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID)
+    .add(WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID)
+    .add(WIDGETLAYOUT_WIDGETS_PROPERTY_ID)
+    .add(WIDGETLAYOUT_SCOPE_PROPERTY_ID)
+    .add(WIDGETLAYOUT_USERNAME_PROPERTY_ID)
+    .add(WIDGETLAYOUT_DISPLAY_NAME_PROPERTY_ID)
+    .add(WIDGETLAYOUT)
+    .build();
 
   @SuppressWarnings("serial")
-  public static Map<Type, String> keyPropertyIds = new HashMap<>();
-
-  static {
-    pkPropertyIds.add(WIDGETLAYOUT_ID_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_ID_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_SECTION_NAME_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_LAYOUT_NAME_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_WIDGETS_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_SCOPE_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_USERNAME_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT_DISPLAY_NAME_PROPERTY_ID);
-    propertyIds.add(WIDGETLAYOUT);
-    keyPropertyIds.put(Type.ActiveWidgetLayout, WIDGETLAYOUT_ID_PROPERTY_ID);
-    keyPropertyIds.put(Type.User, WIDGETLAYOUT_USERNAME_PROPERTY_ID);
-  }
+  public static final Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String>builder()
+    .put(Type.ActiveWidgetLayout, WIDGETLAYOUT_ID_PROPERTY_ID)
+    .put(Type.User, WIDGETLAYOUT_USERNAME_PROPERTY_ID)
+    .build();
 
   @Inject
   private static UserDAO userDAO;
@@ -144,7 +146,6 @@ public class ActiveWidgetLayoutResourceProvider extends AbstractControllerResour
   public Set<Resource> getResources(Request request, Predicate predicate)
       throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
     final Set<Resource> resources = new HashSet<>();
-    final Set<String> requestedIds = getRequestPropertyIds(request, predicate);
     final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate);
 
     List<WidgetLayoutEntity> layoutEntities = new ArrayList<>();

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java

@@ -97,7 +97,7 @@ public class AlertDefinitionResourceProvider extends AbstractControllerResourceP
   protected static final String ALERT_DEF_SOURCE = "AlertDefinition/source";
   protected static final String ALERT_DEF_SOURCE_TYPE = "AlertDefinition/source/type";
 
-  private static Set<String> pkPropertyIds = new HashSet<>(
+  private static final Set<String> pkPropertyIds = new HashSet<>(
     Arrays.asList(ALERT_DEF_ID, ALERT_DEF_NAME));
 
   private static Gson gson = new Gson();

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java

@@ -187,7 +187,7 @@ public class AlertHistoryResourceProvider extends ReadOnlyResourceProvider imple
         }
         else if(StringUtils.isNumeric(definitionId)) {
           // Make sure the user has access to the alert
-          AlertDefinitionEntity alertDefinition = alertDefinitionDAO.findById(Long.valueOf(definitionId));
+          AlertDefinitionEntity alertDefinition = alertDefinitionDAO.findById(Long.parseLong(definitionId));
           AlertResourceProviderUtils.verifyViewAuthorization(alertDefinition);
         }
         else {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java

@@ -89,7 +89,7 @@ public class AlertResourceProvider extends ReadOnlyResourceProvider implements
   protected static final String ALERT_REPEAT_TOLERANCE_REMAINING = "Alert/repeat_tolerance_remaining";
   protected static final String ALERT_FIRMNESS = "Alert/firmness";
 
-  private static Set<String> pkPropertyIds = new HashSet<>(
+  private static final Set<String> pkPropertyIds = new HashSet<>(
     Arrays.asList(ALERT_ID, ALERT_DEFINITION_NAME));
 
   @Inject
@@ -213,7 +213,7 @@ public class AlertResourceProvider extends ReadOnlyResourceProvider implements
           }
           else if(StringUtils.isNumeric(definitionId)) {
             // Make sure the user has access to the alert
-            AlertDefinitionEntity alertDefinition = alertDefinitionDAO.findById(Long.valueOf(definitionId));
+            AlertDefinitionEntity alertDefinition = alertDefinitionDAO.findById(Long.parseLong(definitionId));
             AlertResourceProviderUtils.verifyViewAuthorization(alertDefinition);
           }
           else {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProvider.java

@@ -63,7 +63,7 @@ public class AmbariPrivilegeResourceProvider extends PrivilegeResourceProvider<O
   /**
    * The property ids for an Ambari privilege resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       PRIVILEGE_ID,
       PERMISSION_NAME,
       PERMISSION_LABEL,
@@ -78,7 +78,7 @@ public class AmbariPrivilegeResourceProvider extends PrivilegeResourceProvider<O
   /**
    * The key property ids for a privilege resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.AmbariPrivilege, PRIVILEGE_ID)
       .build();
 

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java

@@ -78,18 +78,18 @@ public class ArtifactResourceProvider extends AbstractResourceProvider {
   /**
    * primary key fields
    */
-  private static Set<String> pkPropertyIds = new HashSet<>();
+  private static final Set<String> pkPropertyIds = new HashSet<>();
 
   /**
    * map of resource type to fk field
    */
-  private static Map<Resource.Type, String> keyPropertyIds =
+  private static final Map<Resource.Type, String> keyPropertyIds =
     new HashMap<>();
 
   /**
    * resource properties
    */
-  private static Set<String> propertyIds = new HashSet<>();
+  private static final Set<String> propertyIds = new HashSet<>();
 
   /**
    * map of resource type to type registration
@@ -698,7 +698,7 @@ public class ArtifactResourceProvider extends AbstractResourceProvider {
 
     @Override
     public String fromPersistId(String value) throws AmbariException {
-      return controller.getClusters().getClusterById(Long.valueOf(value)).getClusterName();
+      return controller.getClusters().getClusterById(Long.parseLong(value)).getClusterName();
     }
 
     @Override

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java

@@ -125,31 +125,31 @@ public class BlueprintConfigurationProcessor {
   /**
    * Single host topology updaters
    */
-  protected static Map<String, Map<String, PropertyUpdater>> singleHostTopologyUpdaters =
+  protected static final Map<String, Map<String, PropertyUpdater>> singleHostTopologyUpdaters =
     new HashMap<>();
 
   /**
    * Multi host topology updaters
    */
-  private static Map<String, Map<String, PropertyUpdater>> multiHostTopologyUpdaters =
+  private static final Map<String, Map<String, PropertyUpdater>> multiHostTopologyUpdaters =
     new HashMap<>();
 
   /**
    * Database host topology updaters
    */
-  private static Map<String, Map<String, PropertyUpdater>> dbHostTopologyUpdaters =
+  private static final Map<String, Map<String, PropertyUpdater>> dbHostTopologyUpdaters =
     new HashMap<>();
 
   /**
    * Updaters for properties which need 'm' appended
    */
-  private static Map<String, Map<String, PropertyUpdater>> mPropertyUpdaters =
+  private static final Map<String, Map<String, PropertyUpdater>> mPropertyUpdaters =
     new HashMap<>();
 
   /**
    * Non topology related updaters
    */
-  private static Map<String, Map<String, PropertyUpdater>> nonTopologyUpdaters =
+  private static final Map<String, Map<String, PropertyUpdater>> nonTopologyUpdaters =
     new HashMap<>();
 
   /**
@@ -158,24 +158,24 @@ public class BlueprintConfigurationProcessor {
    * removed from export, but do not require an update during
    * cluster creation
    */
-  private Map<String, Map<String, PropertyUpdater>> removePropertyUpdaters =
+  private final Map<String, Map<String, PropertyUpdater>> removePropertyUpdaters =
     new HashMap<>();
 
   /**
    * Collection of all updaters
    */
-  private static Collection<Map<String, Map<String, PropertyUpdater>>> allUpdaters =
+  private static final Collection<Map<String, Map<String, PropertyUpdater>>> allUpdaters =
     new ArrayList<>();
 
   /**
    * Compiled regex for hostgroup token with port information.
    */
-  private static Pattern HOSTGROUP_PORT_REGEX = Pattern.compile("%HOSTGROUP::(\\S+?)%:?(\\d+)?");
+  private static final Pattern HOSTGROUP_PORT_REGEX = Pattern.compile("%HOSTGROUP::(\\S+?)%:?(\\d+)?");
 
   /**
    * Compiled regex for hostgroup token with port information.
    */
-  private static Pattern LOCALHOST_PORT_REGEX = Pattern.compile("localhost:?(\\d+)?");
+  private static final Pattern LOCALHOST_PORT_REGEX = Pattern.compile("localhost:?(\\d+)?");
 
   /**
    * Compiled regex for placeholder
@@ -185,7 +185,7 @@ public class BlueprintConfigurationProcessor {
   /**
    * Special network address
    */
-  private static String BIND_ALL_IP_ADDRESS = "0.0.0.0";
+  private static final String BIND_ALL_IP_ADDRESS = "0.0.0.0";
 
   /**
    * Statically-defined set of properties that can support HA using a nameservice name
@@ -193,7 +193,7 @@ public class BlueprintConfigurationProcessor {
    *   This set also contains other HA properties that will be exported if the
    *   expected hostname information is not found.
    */
-  private static Set<String> configPropertiesWithHASupport =
+  private static final Set<String> configPropertiesWithHASupport =
     new HashSet<>(Arrays.asList("fs.defaultFS", "hbase.rootdir", "instance.volumes", "policymgr_external_url", "xasecure.audit.destination.hdfs.dir"));
 
   /**
@@ -2291,8 +2291,6 @@ public class BlueprintConfigurationProcessor {
                                          Map<String, Map<String, String>> properties,
                                          ClusterTopology topology) {
 
-      StringBuilder sb = new StringBuilder();
-
       if (!origValue.contains("%HOSTGROUP") && (!origValue.contains("localhost"))) {
         // this property must contain FQDNs specified directly by the user
         // of the Blueprint, so the processor should not attempt to update them

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java

@@ -128,14 +128,14 @@ public class BlueprintResourceProvider extends AbstractControllerResourceProvide
   /**
    * The key property ids for a Blueprint resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Blueprint, BLUEPRINT_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a Blueprint resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       BLUEPRINT_NAME_PROPERTY_ID,
       STACK_NAME_PROPERTY_ID,
       STACK_VERSION_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java

@@ -116,7 +116,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
   /**
    * The key property ids for a ClientConfig resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, COMPONENT_CLUSTER_NAME_PROPERTY_ID)
       .put(Resource.Type.Service, COMPONENT_SERVICE_NAME_PROPERTY_ID)
       .put(Resource.Type.Component, COMPONENT_COMPONENT_NAME_PROPERTY_ID)
@@ -126,7 +126,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
   /**
    * The property ids for a ClientConfig resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       COMPONENT_CLUSTER_NAME_PROPERTY_ID,
       COMPONENT_SERVICE_NAME_PROPERTY_ID,
       COMPONENT_COMPONENT_NAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProvider.java

@@ -57,7 +57,7 @@ public class ClusterPrivilegeResourceProvider extends PrivilegeResourceProvider<
   /**
    * The property ids for a privilege resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       CLUSTER_NAME,
       PRIVILEGE_ID,
       PERMISSION_NAME,
@@ -69,7 +69,7 @@ public class ClusterPrivilegeResourceProvider extends PrivilegeResourceProvider<
   /**
    * The key property ids for a privilege resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, CLUSTER_NAME)
       .put(Resource.Type.ClusterPrivilege, PRIVILEGE_ID)
       .build();

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java

@@ -60,6 +60,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.security.core.Authentication;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
 
 
@@ -132,14 +133,31 @@ public class ClusterResourceProvider extends AbstractControllerResourceProvider
   /**
    * The key property ids for a cluster resource.
    */
-  protected static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  protected static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, CLUSTER_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a cluster resource.
    */
-  protected static Set<String> propertyIds = new HashSet<>();
+  protected static final Set<String> propertyIds = ImmutableSet.<String>builder()
+    .add(CLUSTER_ID_PROPERTY_ID)
+    .add(CLUSTER_NAME_PROPERTY_ID)
+    .add(CLUSTER_VERSION_PROPERTY_ID)
+    .add(CLUSTER_PROVISIONING_STATE_PROPERTY_ID)
+    .add(CLUSTER_SECURITY_TYPE_PROPERTY_ID)
+    .add(CLUSTER_DESIRED_CONFIGS_PROPERTY_ID)
+    .add(CLUSTER_DESIRED_SERVICE_CONFIG_VERSIONS_PROPERTY_ID)
+    .add(CLUSTER_TOTAL_HOSTS_PROPERTY_ID)
+    .add(CLUSTER_HEALTH_REPORT_PROPERTY_ID)
+    .add(CLUSTER_CREDENTIAL_STORE_PROPERTIES_PROPERTY_ID)
+    .add(BLUEPRINT)
+    .add(SESSION_ATTRIBUTES)
+    .add(SECURITY)
+    .add(CREDENTIALS)
+    .add(QUICKLINKS_PROFILE)
+    .add(CLUSTER_STATE_PROPERTY_ID)
+    .build();
 
   /**
    * Used to serialize to/from json.
@@ -147,26 +165,6 @@ public class ClusterResourceProvider extends AbstractControllerResourceProvider
   private static Gson jsonSerializer;
 
 
-  static {
-    propertyIds.add(CLUSTER_ID_PROPERTY_ID);
-    propertyIds.add(CLUSTER_NAME_PROPERTY_ID);
-    propertyIds.add(CLUSTER_VERSION_PROPERTY_ID);
-    propertyIds.add(CLUSTER_PROVISIONING_STATE_PROPERTY_ID);
-    propertyIds.add(CLUSTER_SECURITY_TYPE_PROPERTY_ID);
-    propertyIds.add(CLUSTER_DESIRED_CONFIGS_PROPERTY_ID);
-    propertyIds.add(CLUSTER_DESIRED_SERVICE_CONFIG_VERSIONS_PROPERTY_ID);
-    propertyIds.add(CLUSTER_TOTAL_HOSTS_PROPERTY_ID);
-    propertyIds.add(CLUSTER_HEALTH_REPORT_PROPERTY_ID);
-    propertyIds.add(CLUSTER_CREDENTIAL_STORE_PROPERTIES_PROPERTY_ID);
-    propertyIds.add(BLUEPRINT);
-    propertyIds.add(SESSION_ATTRIBUTES);
-    propertyIds.add(SECURITY);
-    propertyIds.add(CREDENTIALS);
-    propertyIds.add(QUICKLINKS_PROFILE);
-    propertyIds.add(CLUSTER_STATE_PROPERTY_ID);
-  }
-
-
   // ----- Constructors ----------------------------------------------------
 
   /**

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java

@@ -29,6 +29,7 @@ import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import org.apache.ambari.annotations.Experimental;
@@ -77,7 +78,6 @@ import org.apache.ambari.server.state.Host;
 import org.apache.ambari.server.state.RepositoryType;
 import org.apache.ambari.server.state.RepositoryVersionState;
 import org.apache.ambari.server.state.ServiceComponentHost;
-import org.apache.ambari.server.state.ServiceOsSpecific;
 import org.apache.ambari.server.state.StackId;
 import org.apache.ambari.server.state.repository.ClusterVersionSummary;
 import org.apache.ambari.server.state.repository.VersionDefinitionXml;
@@ -145,13 +145,13 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
    */
   private static final float INSTALL_PACKAGES_SUCCESS_FACTOR = 0.85f;
 
-  private static Set<String> pkPropertyIds = Sets.newHashSet(
+  private static final Set<String> pkPropertyIds = Sets.newHashSet(
       CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID, CLUSTER_STACK_VERSION_ID_PROPERTY_ID,
       CLUSTER_STACK_VERSION_STACK_PROPERTY_ID, CLUSTER_STACK_VERSION_VERSION_PROPERTY_ID,
       CLUSTER_STACK_VERSION_STATE_PROPERTY_ID,
       CLUSTER_STACK_VERSION_REPOSITORY_VERSION_PROPERTY_ID);
 
-  private static Set<String> propertyIds = Sets.newHashSet(CLUSTER_STACK_VERSION_ID_PROPERTY_ID,
+  private static final Set<String> propertyIds = Sets.newHashSet(CLUSTER_STACK_VERSION_ID_PROPERTY_ID,
       CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID, CLUSTER_STACK_VERSION_STACK_PROPERTY_ID,
       CLUSTER_STACK_VERSION_VERSION_PROPERTY_ID, CLUSTER_STACK_VERSION_HOST_STATES_PROPERTY_ID,
       CLUSTER_STACK_VERSION_STATE_PROPERTY_ID, CLUSTER_STACK_VERSION_REPOSITORY_VERSION_PROPERTY_ID,
@@ -159,7 +159,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
       CLUSTER_STACK_VERSION_FORCE, CLUSTER_STACK_VERSION_REPO_SUMMARY_PROPERTY_ID,
       CLUSTER_STACK_VERSION_REPO_SUPPORTS_REVERT, CLUSTER_STACK_VERSION_REPO_REVERT_UPGRADE_ID);
 
-  private static Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String> builder()
+  private static final Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String> builder()
       .put(Type.Cluster, CLUSTER_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID)
       .put(Type.ClusterStackVersion, CLUSTER_STACK_VERSION_ID_PROPERTY_ID)
       .put(Type.Stack, CLUSTER_STACK_VERSION_STACK_PROPERTY_ID)
@@ -329,7 +329,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
       boolean revertable = false;
       if (null != revertableUpgrade) {
         RepositoryVersionEntity revertableRepositoryVersion = revertableUpgrade.getRepositoryVersion();
-        revertable = revertableRepositoryVersion.getId() == repositoryVersionId;
+        revertable = Objects.equals(revertableRepositoryVersion.getId(), repositoryVersionId);
       }
 
       setResourceProperty(resource, CLUSTER_STACK_VERSION_REPO_SUPPORTS_REVERT, revertable, requestedIds);
@@ -662,7 +662,6 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
     }
 
     // determine packages for all services that are installed on host
-    List<ServiceOsSpecific.Package> packages = new ArrayList<>();
     Set<String> servicesOnHost = new HashSet<>();
     List<ServiceComponentHost> components = cluster.getServiceComponentHosts(host.getHostName());
     for (ServiceComponentHost component : components) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java

@@ -55,7 +55,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
@@ -81,9 +81,9 @@ public class CompatibleRepositoryVersionResourceProvider extends ReadOnlyResourc
   public static final String SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID         = new OperatingSystemResourceDefinition().getPluralName();
   private static final String REPOSITORY_STACK_VALUE                           = "stack_value";
 
-  private static Set<String> pkPropertyIds = Collections.singleton(REPOSITORY_VERSION_ID_PROPERTY_ID);
+  private static final Set<String> pkPropertyIds = Collections.singleton(REPOSITORY_VERSION_ID_PROPERTY_ID);
 
-  static Set<String> propertyIds = Sets.newHashSet(
+  static final Set<String> propertyIds = ImmutableSet.of(
     REPOSITORY_STACK_VALUE,
     REPOSITORY_VERSION_ID_PROPERTY_ID,
     REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID,
@@ -95,7 +95,7 @@ public class CompatibleRepositoryVersionResourceProvider extends ReadOnlyResourc
     REPOSITORY_VERSION_SERVICES,
     REPOSITORY_VERSION_STACK_SERVICES);
 
-  static Map<Type, String> keyPropertyIds = new ImmutableMap.Builder<Type, String>()
+  static final Map<Type, String> keyPropertyIds = new ImmutableMap.Builder<Type, String>()
     .put(Type.Stack, REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID)
     .put(Type.StackVersion, REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID)
     .put(Type.Upgrade, REPOSITORY_UPGRADES_SUPPORTED_TYPES_ID)

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java

@@ -126,7 +126,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
   //Parameters from the predicate
   private static final String QUERY_PARAMETERS_RUN_SMOKE_TEST_ID = "params/run_smoke_test";
 
-  private static Set<String> pkPropertyIds = Sets.newHashSet(
+  private static final Set<String> pkPropertyIds = Sets.newHashSet(
           CLUSTER_NAME,
           SERVICE_NAME,
           COMPONENT_NAME);

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java

@@ -112,7 +112,7 @@ public class ConfigGroupResourceProvider extends
   /**
    * The key property ids for a ConfigGroup resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, CLUSTER_NAME)
       .put(Resource.Type.ConfigGroup, ID)
       .build();
@@ -120,7 +120,7 @@ public class ConfigGroupResourceProvider extends
   /**
    * The property ids for a ConfigGroup resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
     CLUSTER_NAME,
     ID,
     GROUP_NAME,
@@ -248,7 +248,7 @@ public class ConfigGroupResourceProvider extends
       }
     }
 
-    RequestStatus status = updateResources(requests);
+    updateResources(requests);
 
     Set<Resource> associatedResources = new HashSet<>();
     for (ConfigGroupRequest configGroupRequest : requests) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java

@@ -98,7 +98,7 @@ public class ConfigurationResourceProvider extends AbstractControllerResourcePro
   /**
    * The primary key property ids for the configuration resource type.
    */
-  private static Set<String> pkPropertyIds =
+  private static final Set<String> pkPropertyIds =
     new HashSet<>(Arrays.asList(new String[]{
       CLUSTER_NAME,
       TYPE}));

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java

@@ -47,15 +47,12 @@ import org.apache.ambari.server.topology.HostGroupImpl;
 import org.apache.ambari.server.topology.HostGroupInfo;
 import org.apache.ambari.server.topology.InvalidTopologyTemplateException;
 import org.apache.ambari.server.topology.TopologyRequest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * Request to export a blueprint from an existing cluster.
  */
 public class ExportBlueprintRequest implements TopologyRequest {
 
-  private final static Logger LOG = LoggerFactory.getLogger(ExportBlueprintRequest.class);
   private static AmbariManagementController controller = AmbariServer.getController();
 
   private String clusterName;
@@ -214,31 +211,11 @@ public class ExportBlueprintRequest implements TopologyRequest {
         group.setName("host_group_" + count++);
         group.addHost(hostName);
       }
-      processHostGroupComponents(group);
     }
 
     return mapHostGroups.values();
   }
 
-
-  /**
-   * Process host group component information for a specific host.
-   *
-   * @param group host group instance
-   *
-   * @return list of component names for the host
-   */
-  private List<Map<String, String>> processHostGroupComponents(ExportedHostGroup group) {
-    List<Map<String, String>> listHostGroupComponents = new ArrayList<>();
-    for (String component : group.getComponents()) {
-      Map<String, String> mapComponentProperties = new HashMap<>();
-      listHostGroupComponents.add(mapComponentProperties);
-      mapComponentProperties.put("name", component);
-    }
-    return listHostGroupComponents;
-  }
-
-
   // ----- Host Group inner class --------------------------------------------
 
   /**

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java

@@ -72,7 +72,7 @@ public class ExtensionLinkResourceProvider extends AbstractControllerResourcePro
   /**
    * The key property ids for a ExtensionLink resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.ExtensionLink, LINK_ID_PROPERTY_ID)
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
@@ -83,7 +83,7 @@ public class ExtensionLinkResourceProvider extends AbstractControllerResourcePro
   /**
    * The property ids for a ExtensionLink resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       LINK_ID_PROPERTY_ID,
       STACK_NAME_PROPERTY_ID,
       STACK_VERSION_PROPERTY_ID,
@@ -218,7 +218,7 @@ public class ExtensionLinkResourceProvider extends AbstractControllerResourcePro
       requests.add(getRequest(propertyMap));
     }
 
-    RequestStatusResponse response = modifyResources(new Command<RequestStatusResponse>() {
+    modifyResources(new Command<RequestStatusResponse>() {
       @Override
       public RequestStatusResponse invoke() throws AmbariException {
         for (ExtensionLinkRequest extensionLinkRequest : requests) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionResourceProvider.java

@@ -56,14 +56,14 @@ public class ExtensionResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The key property ids for a Extension resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Extension, EXTENSION_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a Extension resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       EXTENSION_NAME_PROPERTY_ID);
 
   protected ExtensionResourceProvider(AmbariManagementController managementController) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionVersionResourceProvider.java

@@ -59,7 +59,7 @@ public class ExtensionVersionResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The key property ids for a ExtensionVersion resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Extension, EXTENSION_NAME_PROPERTY_ID)
       .put(Type.ExtensionVersion, EXTENSION_VERSION_PROPERTY_ID)
       .build();
@@ -67,7 +67,7 @@ public class ExtensionVersionResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The property ids for a ExtensionVersion resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       EXTENSION_VERSION_PROPERTY_ID,
       EXTENSION_NAME_PROPERTY_ID,
       EXTENSION_VALID_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java

@@ -67,14 +67,14 @@ public class FeedResourceProvider extends AbstractDRResourceProvider {
   /**
    * The key property ids for a Feed resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.DRFeed, FEED_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a Feed resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       FEED_NAME_PROPERTY_ID,
       FEED_DESCRIPTION_PROPERTY_ID,
       FEED_STATUS_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProvider.java

@@ -50,6 +50,7 @@ import org.apache.ambari.server.security.authorization.RoleAuthorization;
 import org.apache.ambari.server.security.authorization.Users;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.inject.Inject;
 
@@ -77,30 +78,30 @@ public class GroupPrivilegeResourceProvider extends ReadOnlyResourceProvider {
    * Data access object used to obtain cluster entities.
    */
   @Inject
-  protected static ClusterDAO clusterDAO;
+  private static ClusterDAO clusterDAO;
 
   /**
    * Data access object used to obtain group entities.
    */
   @Inject
-  protected static GroupDAO groupDAO;
+  private static GroupDAO groupDAO;
 
   /**
    * Data access object used to obtain view instance entities.
    */
   @Inject
-  protected static ViewInstanceDAO viewInstanceDAO;
+  private static ViewInstanceDAO viewInstanceDAO;
 
   /**
    * Users (helper) object used to obtain privilege entities.
    */
   @Inject
-  protected static Users users;
+  private static Users users;
 
   /**
    * The property ids for a privilege resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       PRIVILEGE_ID,
       PERMISSION_NAME,
       PERMISSION_LABEL,
@@ -129,16 +130,14 @@ public class GroupPrivilegeResourceProvider extends ReadOnlyResourceProvider {
   }
 
   @SuppressWarnings("serial")
-  private static Set<String> pkPropertyIds = new HashSet<String>() {
-    {
-      add(PRIVILEGE_ID);
-    }
-  };
+  private static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+    .add(PRIVILEGE_ID)
+    .build();
 
   /**
    * The key property ids for a privilege resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Group, GROUP_NAME)
       .put(Resource.Type.GroupPrivilege, PRIVILEGE_ID)
       .build();
@@ -280,4 +279,4 @@ public class GroupPrivilegeResourceProvider extends ReadOnlyResourceProvider {
 
     return resource;
   }
-}
+}

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java

@@ -61,14 +61,14 @@ public class GroupResourceProvider extends AbstractControllerResourceProvider {
   /**
    * The key property ids for a Group resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Group, GROUP_GROUPNAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a Group resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       GROUP_GROUPNAME_PROPERTY_ID,
       GROUP_LDAP_GROUP_PROPERTY_ID,
       GROUP_GROUPTYPE_PROPERTY_ID);

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java

@@ -68,7 +68,7 @@ public class HostComponentProcessResourceProvider extends ReadOnlyResourceProvid
   /**
    * The key property ids for a HostComponentProcess resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, CLUSTER_NAME)
       .put(Resource.Type.Host, HOST_NAME)
       .put(Resource.Type.Component, COMPONENT_NAME)
@@ -79,7 +79,7 @@ public class HostComponentProcessResourceProvider extends ReadOnlyResourceProvid
   /**
    * The property ids for a HostComponentProcess resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       NAME,
       STATUS,
       CLUSTER_NAME,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java

@@ -69,7 +69,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.assistedinject.Assisted;
@@ -137,7 +137,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
   /**
    * The key property ids for a HostComponent resource.
    */
-  public static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  public static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, CLUSTER_NAME)
       .put(Resource.Type.Host, HOST_NAME)
       .put(Resource.Type.HostComponent, COMPONENT_NAME)
@@ -147,7 +147,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
   /**
    * The property ids for a HostComponent resource.
    */
-  protected static Set<String> propertyIds = Sets.newHashSet(
+  protected static final Set<String> propertyIds = ImmutableSet.of(
       ROLE_ID,
       CLUSTER_NAME,
       SERVICE_NAME,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java

@@ -85,7 +85,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
 import com.google.inject.assistedinject.AssistedInject;
@@ -163,7 +163,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
   /**
    * The key property ids for a Host resource.
    */
-  public static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  public static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Host, HOST_HOST_NAME_PROPERTY_ID)
       .put(Resource.Type.Cluster, HOST_CLUSTER_NAME_PROPERTY_ID)
       .build();
@@ -171,7 +171,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
   /**
    * The property ids for a Host resource.
    */
-  public static Set<String> propertyIds = Sets.newHashSet(
+  public static final Set<String> propertyIds = ImmutableSet.of(
       HOST_CLUSTER_NAME_PROPERTY_ID,
       HOST_CPU_COUNT_PROPERTY_ID,
       HOST_DESIRED_CONFIGS_PROPERTY_ID,
@@ -375,7 +375,6 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
       throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
 
     final Set<HostRequest> requests = new HashSet<>();
-    Map<String, String> requestInfoProperties = request.getRequestInfoProperties();
 
     for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) {
       requests.add(getRequest(propertyMap));
@@ -1005,7 +1004,6 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
     Set<String> hostsClusters = new HashSet<>();
     Set<String> hostNames = new HashSet<>();
     Set<Long> hostIds = new HashSet<>();
-    Set<Cluster> allClustersWithHosts = new HashSet<>();
     TreeMap<String, TopologyCluster> topologyUpdates = new TreeMap<>();
     for (HostRequest hostRequest : requests) {
       // Assume the user also wants to delete it entirely, including all clusters.

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java

@@ -109,7 +109,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
   protected static final String INSTALL_PACKAGES_FULL_NAME = "Install Version";
 
 
-  private static Set<String> pkPropertyIds = Sets.newHashSet(
+  private static final Set<String> pkPropertyIds = Sets.newHashSet(
           HOST_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID,
           HOST_STACK_VERSION_HOST_NAME_PROPERTY_ID,
           HOST_STACK_VERSION_ID_PROPERTY_ID,
@@ -117,7 +117,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
           HOST_STACK_VERSION_VERSION_PROPERTY_ID,
           HOST_STACK_VERSION_REPO_VERSION_PROPERTY_ID);
 
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
           HOST_STACK_VERSION_ID_PROPERTY_ID,
           HOST_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID,
           HOST_STACK_VERSION_HOST_NAME_PROPERTY_ID,
@@ -129,7 +129,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
           HOST_STACK_VERSION_FORCE_INSTALL_ON_NON_MEMBER_HOST_PROPERTY_ID,
           HOST_STACK_VERSION_COMPONENT_NAMES_PROPERTY_ID);
 
-  private static Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
+  private static final Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
     {
       put(Type.Cluster, HOST_STACK_VERSION_CLUSTER_NAME_PROPERTY_ID);
       put(Type.Host, HOST_STACK_VERSION_HOST_NAME_PROPERTY_ID);

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java

@@ -61,7 +61,7 @@ public class InstanceResourceProvider extends AbstractDRResourceProvider {
   /**
    * The key property ids for a Instance resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.DRInstance, INSTANCE_FEED_NAME_PROPERTY_ID)
       .put(Resource.Type.Workflow, INSTANCE_ID_PROPERTY_ID)
       .build();
@@ -69,7 +69,7 @@ public class InstanceResourceProvider extends AbstractDRResourceProvider {
   /**
    * The property ids for a Instance resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       INSTANCE_FEED_NAME_PROPERTY_ID,
       INSTANCE_ID_PROPERTY_ID,
       INSTANCE_STATUS_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java

@@ -45,7 +45,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * Resource provider for job resources.
@@ -88,7 +88,7 @@ public class JobResourceProvider extends
   /**
    * The key property ids for a Job resource.
    */
-  protected static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  protected static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Cluster, JOB_CLUSTER_NAME_PROPERTY_ID)
       .put(Type.Workflow, JOB_WORKFLOW_ID_PROPERTY_ID)
       .put(Type.Job, JOB_ID_PROPERTY_ID)
@@ -97,7 +97,7 @@ public class JobResourceProvider extends
   /**
    * The property ids for a Job resource.
    */
-  protected static Set<String> propertyIds = Sets.newHashSet(
+  protected static final Set<String> propertyIds = ImmutableSet.of(
       JOB_CLUSTER_NAME_PROPERTY_ID,
       JOB_WORKFLOW_ID_PROPERTY_ID,
       JOB_ID_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java

@@ -60,14 +60,14 @@ public class KerberosDescriptorResourceProvider extends AbstractControllerResour
   /**
    * The key property ids for a KerberosDescriptor resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.KerberosDescriptor, KERBEROS_DESCRIPTOR_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a KerberosDescriptor resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       KERBEROS_DESCRIPTOR_NAME_PROPERTY_ID,
       KERBEROS_DESCRIPTOR_TEXT_PROPERTY_ID);
 

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java

@@ -100,14 +100,14 @@ public class LdapSyncEventResourceProvider extends AbstractControllerResourcePro
   /**
    * The key property ids for a event resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.LdapSyncEvent, EVENT_ID_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a event resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       EVENT_ID_PROPERTY_ID,
       EVENT_STATUS_PROPERTY_ID,
       EVENT_STATUS_DETAIL_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java

@@ -63,7 +63,7 @@ public class MemberResourceProvider extends AbstractControllerResourceProvider {
   /**
    * The key property ids for a Member resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Group, MEMBER_GROUP_NAME_PROPERTY_ID)
       .put(Resource.Type.Member, MEMBER_USER_NAME_PROPERTY_ID)
       .build();
@@ -71,7 +71,7 @@ public class MemberResourceProvider extends AbstractControllerResourceProvider {
   /**
    * The property ids for a Member resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       MEMBER_GROUP_NAME_PROPERTY_ID,
       MEMBER_USER_NAME_PROPERTY_ID);
 

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/OperatingSystemResourceProvider.java

@@ -19,7 +19,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -38,7 +37,8 @@ import org.apache.ambari.server.controller.spi.SystemException;
 import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 public class OperatingSystemResourceProvider extends ReadOnlyResourceProvider {
 
@@ -49,12 +49,12 @@ public class OperatingSystemResourceProvider extends ReadOnlyResourceProvider {
   public static final String OPERATING_SYSTEM_VERSION_DEFINITION_ID_PROPERTY_ID = PropertyHelper.getPropertyId("OperatingSystems", "version_definition_id");
   public static final String OPERATING_SYSTEM_AMBARI_MANAGED_REPOS              = "OperatingSystems/ambari_managed_repositories";
 
-  private static Set<String> pkPropertyIds = Sets.newHashSet(
+  private static final Set<String> pkPropertyIds = ImmutableSet.of(
       OPERATING_SYSTEM_OS_TYPE_PROPERTY_ID,
       OPERATING_SYSTEM_STACK_NAME_PROPERTY_ID,
       OPERATING_SYSTEM_STACK_VERSION_PROPERTY_ID);
 
-  public static Set<String> propertyIds = Sets.newHashSet(
+  public static final Set<String> propertyIds = ImmutableSet.of(
       OPERATING_SYSTEM_OS_TYPE_PROPERTY_ID,
       OPERATING_SYSTEM_STACK_NAME_PROPERTY_ID,
       OPERATING_SYSTEM_STACK_VERSION_PROPERTY_ID,
@@ -62,16 +62,14 @@ public class OperatingSystemResourceProvider extends ReadOnlyResourceProvider {
       OPERATING_SYSTEM_VERSION_DEFINITION_ID_PROPERTY_ID,
       OPERATING_SYSTEM_AMBARI_MANAGED_REPOS);
 
-  public static Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
-    {
-      put(Resource.Type.OperatingSystem, OPERATING_SYSTEM_OS_TYPE_PROPERTY_ID);
-      put(Resource.Type.Stack, OPERATING_SYSTEM_STACK_NAME_PROPERTY_ID);
-      put(Resource.Type.StackVersion, OPERATING_SYSTEM_STACK_VERSION_PROPERTY_ID);
-      put(Resource.Type.RepositoryVersion, OPERATING_SYSTEM_REPOSITORY_VERSION_ID_PROPERTY_ID);
-      put(Resource.Type.CompatibleRepositoryVersion, OPERATING_SYSTEM_REPOSITORY_VERSION_ID_PROPERTY_ID);
-      put(Resource.Type.VersionDefinition, OPERATING_SYSTEM_VERSION_DEFINITION_ID_PROPERTY_ID);
-    }
-  };
+  public static final Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String>builder()
+    .put(Resource.Type.OperatingSystem, OPERATING_SYSTEM_OS_TYPE_PROPERTY_ID)
+    .put(Resource.Type.Stack, OPERATING_SYSTEM_STACK_NAME_PROPERTY_ID)
+    .put(Resource.Type.StackVersion, OPERATING_SYSTEM_STACK_VERSION_PROPERTY_ID)
+    .put(Resource.Type.RepositoryVersion, OPERATING_SYSTEM_REPOSITORY_VERSION_ID_PROPERTY_ID)
+    .put(Resource.Type.CompatibleRepositoryVersion, OPERATING_SYSTEM_REPOSITORY_VERSION_ID_PROPERTY_ID)
+    .put(Resource.Type.VersionDefinition, OPERATING_SYSTEM_VERSION_DEFINITION_ID_PROPERTY_ID)
+    .build();
 
   protected OperatingSystemResourceProvider(AmbariManagementController managementController) {
     super(Resource.Type.OperatingSystem, propertyIds, keyPropertyIds, managementController);

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java

@@ -45,7 +45,7 @@ public class PermissionResourceProvider extends AbstractResourceProvider {
   /**
    * Data access object used to obtain permission entities.
    */
-  protected static PermissionDAO permissionDAO;
+  private static PermissionDAO permissionDAO;
 
   /**
    * Permission property id constants.
@@ -60,14 +60,14 @@ public class PermissionResourceProvider extends AbstractResourceProvider {
   /**
    * The key property ids for a permission resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Permission, PERMISSION_ID_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a permission resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       PERMISSION_ID_PROPERTY_ID,
       PERMISSION_NAME_PROPERTY_ID,
       PERMISSION_LABEL_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java

@@ -18,7 +18,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -58,7 +57,8 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 import com.google.inject.Provider;
 
@@ -108,9 +108,9 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
   @Inject
   private static CheckHelper checkHelper;
 
-  private static Set<String> pkPropertyIds = Collections.singleton(UPGRADE_CHECK_ID_PROPERTY_ID);
+  private static final Set<String> pkPropertyIds = Collections.singleton(UPGRADE_CHECK_ID_PROPERTY_ID);
 
-  public static Set<String> propertyIds = Sets.newHashSet(
+  public static final Set<String> propertyIds = ImmutableSet.of(
       UPGRADE_CHECK_ID_PROPERTY_ID,
       UPGRADE_CHECK_CHECK_PROPERTY_ID,
       UPGRADE_CHECK_STATUS_PROPERTY_ID,
@@ -126,12 +126,10 @@ public class PreUpgradeCheckResourceProvider extends ReadOnlyResourceProvider {
 
 
   @SuppressWarnings("serial")
-  public static Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
-    {
-      put(Type.PreUpgradeCheck, UPGRADE_CHECK_ID_PROPERTY_ID);
-      put(Type.Cluster, UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID);
-    }
-  };
+  public static final Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String>builder()
+    .put(Type.PreUpgradeCheck, UPGRADE_CHECK_ID_PROPERTY_ID)
+    .put(Type.Cluster, UPGRADE_CHECK_CLUSTER_NAME_PROPERTY_ID)
+    .build();
 
   /**
    * Constructor.

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java

@@ -62,22 +62,22 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes
   /**
    * Data access object used to obtain privilege entities.
    */
-  protected static PrivilegeDAO privilegeDAO;
+  private static PrivilegeDAO privilegeDAO;
 
   /**
    * Data access object used to obtain user entities.
    */
-  protected static UserDAO userDAO;
+  private static UserDAO userDAO;
 
   /**
    * Data access object used to obtain group entities.
    */
-  protected static GroupDAO groupDAO;
+  private static GroupDAO groupDAO;
 
   /**
    * Data access object used to obtain principal entities.
    */
-  protected static PrincipalDAO principalDAO;
+  private static PrincipalDAO principalDAO;
 
   /**
    * Data access object used to obtain permission entities.
@@ -87,7 +87,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes
   /**
    * Data access object used to obtain resource entities.
    */
-  protected static ResourceDAO resourceDAO;
+  private static ResourceDAO resourceDAO;
 
   public static final String PRIVILEGE_INFO = "PrivilegeInfo";
 

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java

@@ -356,7 +356,7 @@ public class ProvisionClusterRequest extends BaseClusterRequest {
     throws InvalidTopologyTemplateException {
 
     if (hostGroupProperties.containsKey(HOSTGROUP_HOST_COUNT_PROPERTY)) {
-      hostGroupInfo.setRequestedCount(Integer.valueOf(String.valueOf(
+      hostGroupInfo.setRequestedCount(Integer.parseInt(String.valueOf(
         hostGroupProperties.get(HOSTGROUP_HOST_COUNT_PROPERTY))));
       LOG.info("Stored expected hosts count {} for group {}",
         hostGroupInfo.getRequestedHostCount(), hostGroupInfo.getHostGroupName());

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java

@@ -19,8 +19,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -47,6 +45,9 @@ import org.apache.ambari.server.state.quicklinksprofile.QuickLinkVisibilityContr
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
 public class QuickLinkArtifactResourceProvider extends AbstractControllerResourceProvider {
 
   private static final Logger LOG = LoggerFactory.getLogger(QuickLinkArtifactResourceProvider.class);
@@ -61,34 +62,31 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc
   /**
    * primary key fields
    */
-  public static Set<String> pkPropertyIds = new HashSet<>();
+  public static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+    .add(QUICKLINK_FILE_NAME_PROPERTY_ID)
+    .build();
+
   /**
    * map of resource type to fk field
    */
-  public static Map<Resource.Type, String> keyPropertyIds =
-    new HashMap<>();
+  public static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+    .put(Resource.Type.QuickLink, QUICKLINK_FILE_NAME_PROPERTY_ID)
+    .put(Resource.Type.Stack, STACK_NAME_PROPERTY_ID)
+    .put(Resource.Type.StackVersion, STACK_VERSION_PROPERTY_ID)
+    .put(Resource.Type.StackService, STACK_SERVICE_NAME_PROPERTY_ID)
+    .build();
 
   /**
    * resource properties
    */
-  public static Set<String> propertyIds = new HashSet<>();
-
-  static {
-    keyPropertyIds.put(Resource.Type.QuickLink, QUICKLINK_FILE_NAME_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.Stack, STACK_NAME_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.StackVersion, STACK_VERSION_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.StackService, STACK_SERVICE_NAME_PROPERTY_ID);
-
-    pkPropertyIds.add(QUICKLINK_FILE_NAME_PROPERTY_ID);
-
-    // resource properties
-    propertyIds.add(STACK_NAME_PROPERTY_ID);
-    propertyIds.add(STACK_VERSION_PROPERTY_ID);
-    propertyIds.add(STACK_SERVICE_NAME_PROPERTY_ID);
-    propertyIds.add(QUICKLINK_FILE_NAME_PROPERTY_ID);
-    propertyIds.add(QUICKLINK_DATA_PROPERTY_ID);
-    propertyIds.add(QUICKLINK_DEFAULT_PROPERTY_ID);
-  }
+  public static final Set<String> propertyIds = ImmutableSet.<String>builder()
+    .add(STACK_NAME_PROPERTY_ID)
+    .add(STACK_VERSION_PROPERTY_ID)
+    .add(STACK_SERVICE_NAME_PROPERTY_ID)
+    .add(QUICKLINK_FILE_NAME_PROPERTY_ID)
+    .add(QUICKLINK_DATA_PROPERTY_ID)
+    .add(QUICKLINK_DEFAULT_PROPERTY_ID)
+    .build();
 
   /**
    * Create a  new resource provider for the given management controller.

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java

@@ -91,7 +91,7 @@ public class RecommendationResourceProvider extends StackAdvisorResourceProvider
   /**
    * The key property ids for a Recommendation resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Recommendation, RECOMMENDATION_ID_PROPERTY_ID)
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
@@ -100,7 +100,7 @@ public class RecommendationResourceProvider extends StackAdvisorResourceProvider
   /**
    * The property ids for a Recommendation resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       RECOMMENDATION_ID_PROPERTY_ID,
       STACK_NAME_PROPERTY_ID,
       STACK_VERSION_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java

@@ -79,14 +79,14 @@ public class RemoteClusterResourceProvider extends AbstractAuthorizedResourcePro
   /**
    * The key property ids for a Remote Cluster resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.RemoteCluster, CLUSTER_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a Remote Cluster resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       CLUSTER_NAME_PROPERTY_ID,
       CLUSTER_ID_PROPERTY_ID,
       CLUSTER_URL_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java

@@ -20,7 +20,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import java.util.Collections;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
@@ -46,6 +45,9 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 import org.apache.commons.lang.BooleanUtils;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
 public class RepositoryResourceProvider extends AbstractControllerResourceProvider {
 
   public static final String REPOSITORY_REPO_NAME_PROPERTY_ID             = PropertyHelper.getPropertyId("Repositories", "repo_name");
@@ -69,50 +71,44 @@ public class RepositoryResourceProvider extends AbstractControllerResourceProvid
   public static final String REPOSITORY_APPLICABLE_SERVICES_PROPERTY_ID   = PropertyHelper.getPropertyId("Repositories", "applicable_services");
 
   @SuppressWarnings("serial")
-  private static Set<String> pkPropertyIds = new HashSet<String>() {
-    {
-      add(REPOSITORY_STACK_NAME_PROPERTY_ID);
-      add(REPOSITORY_STACK_VERSION_PROPERTY_ID);
-      add(REPOSITORY_OS_TYPE_PROPERTY_ID);
-      add(REPOSITORY_REPO_ID_PROPERTY_ID);
-    }
-  };
+  private static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+    .add(REPOSITORY_STACK_NAME_PROPERTY_ID)
+    .add(REPOSITORY_STACK_VERSION_PROPERTY_ID)
+    .add(REPOSITORY_OS_TYPE_PROPERTY_ID)
+    .add(REPOSITORY_REPO_ID_PROPERTY_ID)
+    .build();
 
   @SuppressWarnings("serial")
-  public static Set<String> propertyIds = new HashSet<String>() {
-    {
-      add(REPOSITORY_REPO_NAME_PROPERTY_ID);
-      add(REPOSITORY_DISTRIBUTION_PROPERTY_ID);
-      add(REPOSITORY_COMPONENTS_PROPERTY_ID);
-      add(REPOSITORY_STACK_NAME_PROPERTY_ID);
-      add(REPOSITORY_STACK_VERSION_PROPERTY_ID);
-      add(REPOSITORY_OS_TYPE_PROPERTY_ID);
-      add(REPOSITORY_BASE_URL_PROPERTY_ID);
-      add(REPOSITORY_REPO_ID_PROPERTY_ID);
-      add(REPOSITORY_MIRRORS_LIST_PROPERTY_ID);
-      add(REPOSITORY_DEFAULT_BASE_URL_PROPERTY_ID);
-      add(REPOSITORY_VERIFY_BASE_URL_PROPERTY_ID);
-      add(REPOSITORY_REPOSITORY_VERSION_ID_PROPERTY_ID);
-      add(REPOSITORY_VERSION_DEFINITION_ID_PROPERTY_ID);
-      add(REPOSITORY_CLUSTER_STACK_VERSION_PROPERTY_ID);
-      add(REPOSITORY_UNIQUE_PROPERTY_ID);
-      add(REPOSITORY_TAGS_PROPERTY_ID);
-      add(REPOSITORY_APPLICABLE_SERVICES_PROPERTY_ID);
-    }
-  };
+  public static final Set<String> propertyIds = ImmutableSet.<String>builder()
+    .add(REPOSITORY_REPO_NAME_PROPERTY_ID)
+    .add(REPOSITORY_DISTRIBUTION_PROPERTY_ID)
+    .add(REPOSITORY_COMPONENTS_PROPERTY_ID)
+    .add(REPOSITORY_STACK_NAME_PROPERTY_ID)
+    .add(REPOSITORY_STACK_VERSION_PROPERTY_ID)
+    .add(REPOSITORY_OS_TYPE_PROPERTY_ID)
+    .add(REPOSITORY_BASE_URL_PROPERTY_ID)
+    .add(REPOSITORY_REPO_ID_PROPERTY_ID)
+    .add(REPOSITORY_MIRRORS_LIST_PROPERTY_ID)
+    .add(REPOSITORY_DEFAULT_BASE_URL_PROPERTY_ID)
+    .add(REPOSITORY_VERIFY_BASE_URL_PROPERTY_ID)
+    .add(REPOSITORY_REPOSITORY_VERSION_ID_PROPERTY_ID)
+    .add(REPOSITORY_VERSION_DEFINITION_ID_PROPERTY_ID)
+    .add(REPOSITORY_CLUSTER_STACK_VERSION_PROPERTY_ID)
+    .add(REPOSITORY_UNIQUE_PROPERTY_ID)
+    .add(REPOSITORY_TAGS_PROPERTY_ID)
+    .add(REPOSITORY_APPLICABLE_SERVICES_PROPERTY_ID)
+    .build();
 
   @SuppressWarnings("serial")
-  public static Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
-    {
-      put(Resource.Type.Stack, REPOSITORY_STACK_NAME_PROPERTY_ID);
-      put(Resource.Type.StackVersion, REPOSITORY_STACK_VERSION_PROPERTY_ID);
-      put(Resource.Type.ClusterStackVersion, REPOSITORY_CLUSTER_STACK_VERSION_PROPERTY_ID);
-      put(Resource.Type.OperatingSystem, REPOSITORY_OS_TYPE_PROPERTY_ID);
-      put(Resource.Type.Repository, REPOSITORY_REPO_ID_PROPERTY_ID);
-      put(Resource.Type.RepositoryVersion, REPOSITORY_REPOSITORY_VERSION_ID_PROPERTY_ID);
-      put(Resource.Type.VersionDefinition, REPOSITORY_VERSION_DEFINITION_ID_PROPERTY_ID);
-    }
-  };
+  public static final Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String>builder()
+    .put(Resource.Type.Stack, REPOSITORY_STACK_NAME_PROPERTY_ID)
+    .put(Resource.Type.StackVersion, REPOSITORY_STACK_VERSION_PROPERTY_ID)
+    .put(Resource.Type.ClusterStackVersion, REPOSITORY_CLUSTER_STACK_VERSION_PROPERTY_ID)
+    .put(Resource.Type.OperatingSystem, REPOSITORY_OS_TYPE_PROPERTY_ID)
+    .put(Resource.Type.Repository, REPOSITORY_REPO_ID_PROPERTY_ID)
+    .put(Resource.Type.RepositoryVersion, REPOSITORY_REPOSITORY_VERSION_ID_PROPERTY_ID)
+    .put(Resource.Type.VersionDefinition, REPOSITORY_VERSION_DEFINITION_ID_PROPERTY_ID)
+    .build();
 
   public RepositoryResourceProvider(AmbariManagementController managementController) {
     super(Resource.Type.Repository, propertyIds, keyPropertyIds, managementController);

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java

@@ -69,6 +69,7 @@ import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 import com.google.gson.Gson;
 import com.google.inject.Inject;
@@ -103,10 +104,10 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc
   public static final String REPOSITORY_VERSION_HAS_CHILDREN                   = "RepositoryVersions/has_children";
 
   @SuppressWarnings("serial")
-  private static Set<String> pkPropertyIds = Sets.newHashSet(REPOSITORY_VERSION_ID_PROPERTY_ID);
+  private static final Set<String> pkPropertyIds = ImmutableSet.of(REPOSITORY_VERSION_ID_PROPERTY_ID);
 
   @SuppressWarnings("serial")
-  public static Set<String> propertyIds = Sets.newHashSet(
+  public static final Set<String> propertyIds = ImmutableSet.of(
       REPOSITORY_VERSION_ID_PROPERTY_ID,
       REPOSITORY_VERSION_REPOSITORY_VERSION_PROPERTY_ID,
       REPOSITORY_VERSION_DISPLAY_NAME_PROPERTY_ID,
@@ -126,7 +127,7 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc
       REPOSITORY_VERSION_RESOLVED_PROPERTY_ID);
 
   @SuppressWarnings("serial")
-  public static Map<Type, String> keyPropertyIds = new ImmutableMap.Builder<Type, String>()
+  public static final Map<Type, String> keyPropertyIds = new ImmutableMap.Builder<Type, String>()
       .put(Type.Stack, REPOSITORY_VERSION_STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, REPOSITORY_VERSION_STACK_VERSION_PROPERTY_ID)
       .put(Type.RepositoryVersion, REPOSITORY_VERSION_ID_PROPERTY_ID)

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java

@@ -151,7 +151,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider
   /**
    * The key property ids for a Request resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Request, REQUEST_ID_PROPERTY_ID)
       .put(Resource.Type.Cluster, REQUEST_CLUSTER_NAME_PROPERTY_ID)
       .build();
@@ -260,9 +260,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider
             }
           } else {
             // A custom action has been requested
-            ActionDefinition actionDefinition = (actionName == null)
-                ? null
-                : getManagementController().getAmbariMetaInfo().getActionDefinition(actionName);
+            ActionDefinition actionDefinition = getManagementController().getAmbariMetaInfo().getActionDefinition(actionName);
 
             Set<RoleAuthorization> permissions = (actionDefinition == null)
                 ? null
@@ -423,7 +421,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider
     // Cluster name may be empty for custom actions
     String clusterNameStr = (String) propertyMap.get(REQUEST_CLUSTER_NAME_PROPERTY_ID);
     String requestIdStr = (String) propertyMap.get(REQUEST_ID_PROPERTY_ID);
-    long requestId = Integer.valueOf(requestIdStr);
+    long requestId = Integer.parseInt(requestIdStr);
     String requestStatusStr = (String) propertyMap.get(REQUEST_STATUS_PROPERTY_ID);
     HostRoleStatus requestStatus = null;
     if (requestStatusStr != null) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java

@@ -143,7 +143,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP
   /**
    * The key property ids for a RequestSchedule resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, CLUSTER_NAME)
       .put(Resource.Type.RequestSchedule, ID)
       .build();
@@ -151,7 +151,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP
   /**
    * The property ids for a RequestSchedule resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
     ID,
     CLUSTER_NAME,
     DESCRIPTION,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java

@@ -61,7 +61,7 @@ public class RootServiceComponentResourceProvider extends ReadOnlyResourceProvid
   /**
    * The key property ids for a RootServiceComponent resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.RootService, SERVICE_NAME_PROPERTY_ID)
       .put(Type.RootServiceComponent, COMPONENT_NAME_PROPERTY_ID)
       .build();
@@ -69,7 +69,7 @@ public class RootServiceComponentResourceProvider extends ReadOnlyResourceProvid
   /**
    * The property ids for a RootServiceComponent resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       SERVICE_NAME_PROPERTY_ID,
       COMPONENT_NAME_PROPERTY_ID,
       COMPONENT_VERSION_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java

@@ -63,7 +63,7 @@ public class RootServiceHostComponentResourceProvider extends ReadOnlyResourcePr
   /**
    * The key property ids for a RootServiceHostComponent resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.RootService, SERVICE_NAME_PROPERTY_ID)
       .put(Type.Host, HOST_NAME_PROPERTY_ID)
       .put(Type.RootServiceComponent, COMPONENT_NAME_PROPERTY_ID)
@@ -73,7 +73,7 @@ public class RootServiceHostComponentResourceProvider extends ReadOnlyResourcePr
   /**
    * The property ids for a RootServiceHostComponent resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       SERVICE_NAME_PROPERTY_ID,
       HOST_NAME_PROPERTY_ID,
       COMPONENT_NAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java

@@ -49,14 +49,14 @@ public class RootServiceResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The key property ids for a RootService resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.RootService, SERVICE_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a RootService resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       SERVICE_NAME_PROPERTY_ID);
 
   protected RootServiceResourceProvider(AmbariManagementController managementController) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java

@@ -164,7 +164,7 @@ public class ScaleClusterRequest extends BaseClusterRequest {
         throw new InvalidTopologyTemplateException(
             "Can't specify both host_name and host_count for the same hostgroup: " + hgName);
       }
-      hostGroupInfo.setRequestedCount(Integer.valueOf(String.valueOf(
+      hostGroupInfo.setRequestedCount(Integer.parseInt(String.valueOf(
           properties.get(HostResourceProvider.HOST_COUNT_PROPERTY_ID))));
     } else {
       if (hostGroupInfo.getRequestedHostCount() != hostGroupInfo.getHostNames().size()) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java

@@ -100,7 +100,7 @@ public class ServiceConfigVersionResourceProvider extends
   /**
    * The primary key property ids for the service config version resource type.
    */
-  private static Set<String> pkPropertyIds =
+  private static final Set<String> pkPropertyIds =
     new HashSet<>(Arrays.asList(new String[]{
             CLUSTER_NAME_PROPERTY_ID,
             SERVICE_NAME_PROPERTY_ID}));

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java

@@ -143,7 +143,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
   private static final String QUERY_PARAMETERS_RECONFIGURE_CLIENT = "params/reconfigure_client";
   private static final String QUERY_PARAMETERS_START_DEPENDENCIES = "params/start_dependencies";
 
-  private static Set<String> pkPropertyIds =
+  private static final Set<String> pkPropertyIds =
     new HashSet<>(Arrays.asList(new String[]{
       SERVICE_CLUSTER_NAME_PROPERTY_ID,
       SERVICE_SERVICE_NAME_PROPERTY_ID}));

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java

@@ -18,7 +18,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import java.util.EnumSet;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
@@ -47,6 +46,7 @@ import org.apache.ambari.server.security.authorization.RoleAuthorization;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
 
@@ -74,12 +74,22 @@ public class SettingResourceProvider extends AbstractAuthorizedResourceProvider
   /**
    * The property ids for setting resource.
    */
-  private static final Set<String> propertyIds = new HashSet<>();
+  private static final Set<String> propertyIds = ImmutableSet.<String>builder()
+    .add(SETTING_NAME_PROPERTY_ID)
+    .add(SETTING_SETTING_TYPE_PROPERTY_ID)
+    .add(SETTING_CONTENT_PROPERTY_ID)
+    .add(SETTING_UPDATED_BY_PROPERTY_ID)
+    .add(SETTING_UPDATE_TIMESTAMP_PROPERTY_ID)
+    .add(SETTING_SETTING_TYPE_PROPERTY_ID)
+    .add(SETTING)
+    .build();
 
   /**
    * The key property ids for setting resource.
    */
-  private static final Map<Resource.Type, String> keyPropertyIds = new HashMap<>();
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+    .put(Resource.Type.Setting, SETTING_NAME_PROPERTY_ID)
+    .build();
 
   private static final Set<String> REQUIRED_PROPERTIES = ImmutableSet.of(
     SETTING_NAME_PROPERTY_ID,
@@ -90,18 +100,6 @@ public class SettingResourceProvider extends AbstractAuthorizedResourceProvider
   @Inject
   private static SettingDAO dao;
 
-  static {
-    propertyIds.add(SETTING_NAME_PROPERTY_ID);
-    propertyIds.add(SETTING_SETTING_TYPE_PROPERTY_ID);
-    propertyIds.add(SETTING_CONTENT_PROPERTY_ID);
-    propertyIds.add(SETTING_UPDATED_BY_PROPERTY_ID);
-    propertyIds.add(SETTING_UPDATE_TIMESTAMP_PROPERTY_ID);
-    propertyIds.add(SETTING_SETTING_TYPE_PROPERTY_ID);
-    propertyIds.add(SETTING);
-
-    keyPropertyIds.put(Resource.Type.Setting, SETTING_NAME_PROPERTY_ID);
-  }
-
   protected SettingResourceProvider() {
     super(Resource.Type.Setting, propertyIds, keyPropertyIds);
     EnumSet<RoleAuthorization> requiredAuthorizations = EnumSet.of(RoleAuthorization.AMBARI_MANAGE_SETTINGS);

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java

@@ -84,7 +84,7 @@ public abstract class StackAdvisorResourceProvider extends ReadOnlyResourceProvi
   private static final String CONFIG_GROUPS_HOSTS_PROPERTY = "hosts";
 
   protected static StackAdvisorHelper saHelper;
-  protected static Configuration configuration;
+  private static Configuration configuration;
   protected static final String USER_CONTEXT_OPERATION_PROPERTY = "user_context/operation";
   protected static final String USER_CONTEXT_OPERATION_DETAILS_PROPERTY = "user_context/operation_details";
 

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java

@@ -59,6 +59,8 @@ import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.google.inject.Inject;
@@ -116,18 +118,30 @@ public class StackArtifactResourceProvider extends AbstractControllerResourcePro
   /**
    * primary key fields
    */
-  public static Set<String> pkPropertyIds = new HashSet<>();
+  public static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+    .add(ARTIFACT_NAME_PROPERTY_ID)
+    .build();
 
   /**
    * map of resource type to fk field
    */
-  public static Map<Resource.Type, String> keyPropertyIds =
-    new HashMap<>();
+  public static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+    .put(Resource.Type.StackArtifact, ARTIFACT_NAME_PROPERTY_ID)
+    .put(Resource.Type.Stack, STACK_NAME_PROPERTY_ID)
+    .put(Resource.Type.StackVersion, STACK_VERSION_PROPERTY_ID)
+    .put(Resource.Type.StackService, STACK_SERVICE_NAME_PROPERTY_ID)
+    .build();
 
   /**
    * resource properties
    */
-  public static Set<String> propertyIds = new HashSet<>();
+  public static final Set<String> propertyIds = ImmutableSet.<String>builder()
+    .add(STACK_NAME_PROPERTY_ID)
+    .add(STACK_VERSION_PROPERTY_ID)
+    .add(STACK_SERVICE_NAME_PROPERTY_ID)
+    .add(ARTIFACT_NAME_PROPERTY_ID)
+    .add(ARTIFACT_DATA_PROPERTY_ID)
+    .build();
 
   /**
    * name of the kerberos descriptor artifact.
@@ -159,25 +173,6 @@ public class StackArtifactResourceProvider extends AbstractControllerResourcePro
   Type widgetLayoutType = new TypeToken<Map<String, List<WidgetLayout>>>(){}.getType();
   Gson gson = new Gson();
 
-  // set resource properties, pk and fk's
-  static {
-    // resource properties
-    propertyIds.add(STACK_NAME_PROPERTY_ID);
-    propertyIds.add(STACK_VERSION_PROPERTY_ID);
-    propertyIds.add(STACK_SERVICE_NAME_PROPERTY_ID);
-    propertyIds.add(ARTIFACT_NAME_PROPERTY_ID);
-    propertyIds.add(ARTIFACT_DATA_PROPERTY_ID);
-
-    // pk property
-    pkPropertyIds.add(ARTIFACT_NAME_PROPERTY_ID);
-
-    // fk properties
-    keyPropertyIds.put(Resource.Type.StackArtifact, ARTIFACT_NAME_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.Stack, STACK_NAME_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.StackVersion, STACK_VERSION_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.StackService, STACK_SERVICE_NAME_PROPERTY_ID);
-  }
-
   /**
    * Constructor.
    *

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java

@@ -65,7 +65,7 @@ public class StackConfigurationDependencyResourceProvider extends
   /**
    * The key property ids for a StackConfigurationDependency resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
       .put(Type.StackService, SERVICE_NAME_PROPERTY_ID)
@@ -77,7 +77,7 @@ public class StackConfigurationDependencyResourceProvider extends
   /**
    * The property ids for a StackConfigurationDependency resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       STACK_NAME_PROPERTY_ID,
       STACK_VERSION_PROPERTY_ID,
       SERVICE_NAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProvider.java

@@ -84,7 +84,7 @@ public class StackConfigurationResourceProvider extends
   /**
    * The key property ids for a StackConfiguration resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
       .put(Type.StackService, SERVICE_NAME_PROPERTY_ID)
@@ -94,7 +94,7 @@ public class StackConfigurationResourceProvider extends
   /**
    * The property ids for a StackConfiguration resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       STACK_NAME_PROPERTY_ID,
       STACK_VERSION_PROPERTY_ID,
       SERVICE_NAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java

@@ -75,7 +75,7 @@ public class StackDependencyResourceProvider extends AbstractResourceProvider {
   /**
    * The key property ids for a StackDependency resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Stack, STACK_NAME_ID)
       .put(Resource.Type.StackVersion, STACK_VERSION_ID)
       .put(Resource.Type.StackService, DEPENDENT_SERVICE_NAME_ID)
@@ -86,7 +86,7 @@ public class StackDependencyResourceProvider extends AbstractResourceProvider {
   /**
    * The property ids for a StackDependency resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       STACK_NAME_ID,
       STACK_VERSION_ID,
       DEPENDENT_SERVICE_NAME_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java

@@ -81,7 +81,7 @@ public class StackLevelConfigurationResourceProvider extends
   /**
    * The key property ids for a StackLevelConfiguration resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
       .put(Type.StackLevelConfiguration, PROPERTY_NAME_PROPERTY_ID)
@@ -90,7 +90,7 @@ public class StackLevelConfigurationResourceProvider extends
   /**
    * The property ids for a StackLevelConfiguration resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       STACK_NAME_PROPERTY_ID,
       STACK_VERSION_PROPERTY_ID,
       PROPERTY_NAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java

@@ -40,7 +40,7 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 
 public class StackResourceProvider extends ReadOnlyResourceProvider {
 
@@ -50,14 +50,14 @@ public class StackResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The key property ids for a Stack resource.
    */
-  protected static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  protected static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a Stack resource.
    */
-  protected static Set<String> propertyIds = Sets.newHashSet(
+  protected static final Set<String> propertyIds = ImmutableSet.of(
       STACK_NAME_PROPERTY_ID);
 
   protected StackResourceProvider(AmbariManagementController managementController) {

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java

@@ -111,7 +111,7 @@ public class StackServiceComponentResourceProvider extends
   /**
    * The key property ids for a StackServiceComponent resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
       .put(Type.StackService, SERVICE_NAME_PROPERTY_ID)
@@ -121,7 +121,7 @@ public class StackServiceComponentResourceProvider extends
   /**
    * The property ids for a StackServiceComponent resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       STACK_NAME_PROPERTY_ID,
       STACK_VERSION_PROPERTY_ID,
       SERVICE_NAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java

@@ -111,7 +111,7 @@ public class StackServiceResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The key property ids for a StackVersion resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
       .put(Type.StackService, SERVICE_NAME_PROPERTY_ID)
@@ -120,7 +120,7 @@ public class StackServiceResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The property ids for a StackVersion resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       SERVICE_NAME_PROPERTY_ID,
       SERVICE_TYPE_PROPERTY_ID,
       STACK_NAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java

@@ -40,7 +40,7 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
 import org.apache.ambari.server.controller.utilities.PropertyHelper;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 
 @StaticallyInject
 public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
@@ -60,7 +60,7 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The key property ids for a StackVersion resource.
    */
-  protected static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  protected static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
       .build();
@@ -68,7 +68,7 @@ public class StackVersionResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The property ids for a StackVersion resource.
    */
-  protected static Set<String> propertyIds = Sets.newHashSet(
+  protected static final Set<String> propertyIds = ImmutableSet.of(
       STACK_VERSION_PROPERTY_ID,
       STACK_NAME_PROPERTY_ID,
       STACK_MIN_VERSION_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java

@@ -59,7 +59,8 @@ import org.apache.commons.lang.math.NumberUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * ResourceProvider for Stage
@@ -107,40 +108,41 @@ public class StageResourceProvider extends AbstractControllerResourceProvider im
   /**
    * The property ids for a stage resource.
    */
-  static final Set<String> PROPERTY_IDS = new HashSet<>();
+  static final Set<String> PROPERTY_IDS = ImmutableSet.<String>builder()
+    .add(STAGE_STAGE_ID)
+    .add(STAGE_CLUSTER_NAME)
+    .add(STAGE_REQUEST_ID)
+    .add(STAGE_LOG_INFO)
+    .add(STAGE_CONTEXT)
+    .add(STAGE_COMMAND_PARAMS)
+    .add(STAGE_HOST_PARAMS)
+    .add(STAGE_SKIPPABLE)
+    .add(STAGE_PROGRESS_PERCENT)
+    .add(STAGE_STATUS)
+    .add(STAGE_DISPLAY_STATUS)
+    .add(STAGE_START_TIME)
+    .add(STAGE_END_TIME)
+    .build();
 
   /**
    * The key property ids for a stage resource.
    */
-  private static final Map<Resource.Type, String> KEY_PROPERTY_IDS =
-    new HashMap<>();
+  private static final Map<Resource.Type, String> KEY_PROPERTY_IDS = ImmutableMap.<Resource.Type, String>builder()
+    .put(Resource.Type.Stage, STAGE_STAGE_ID)
+    .put(Resource.Type.Cluster, STAGE_CLUSTER_NAME)
+    .put(Resource.Type.Request, STAGE_REQUEST_ID)
+    .build();
 
   static {
     // properties
-    PROPERTY_IDS.add(STAGE_STAGE_ID);
-    PROPERTY_IDS.add(STAGE_CLUSTER_NAME);
-    PROPERTY_IDS.add(STAGE_REQUEST_ID);
-    PROPERTY_IDS.add(STAGE_LOG_INFO);
-    PROPERTY_IDS.add(STAGE_CONTEXT);
-    PROPERTY_IDS.add(STAGE_COMMAND_PARAMS);
-    PROPERTY_IDS.add(STAGE_HOST_PARAMS);
-    PROPERTY_IDS.add(STAGE_SKIPPABLE);
-    PROPERTY_IDS.add(STAGE_PROGRESS_PERCENT);
-    PROPERTY_IDS.add(STAGE_STATUS);
-    PROPERTY_IDS.add(STAGE_DISPLAY_STATUS);
-    PROPERTY_IDS.add(STAGE_START_TIME);
-    PROPERTY_IDS.add(STAGE_END_TIME);
 
     // keys
-    KEY_PROPERTY_IDS.put(Resource.Type.Stage, STAGE_STAGE_ID);
-    KEY_PROPERTY_IDS.put(Resource.Type.Cluster, STAGE_CLUSTER_NAME);
-    KEY_PROPERTY_IDS.put(Resource.Type.Request, STAGE_REQUEST_ID);
   }
 
   /**
    * These fields may contain password in them, so have to mask with.
    */
-  static final Set<String> PROPERTIES_TO_MASK_PASSWORD_IN = Sets.newHashSet(STAGE_COMMAND_PARAMS, STAGE_HOST_PARAMS);
+  static final Set<String> PROPERTIES_TO_MASK_PASSWORD_IN = ImmutableSet.of(STAGE_COMMAND_PARAMS, STAGE_HOST_PARAMS);
 
   // ----- Constructors ------------------------------------------------------
 

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java

@@ -57,14 +57,14 @@ public class TargetClusterResourceProvider extends AbstractDRResourceProvider {
   /**
    * The key property ids for a TargetCluster resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, CLUSTER_NAME_PROPERTY_ID)
       .build();
 
   /**
    * The property ids for a TargetCluster resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       CLUSTER_NAME_PROPERTY_ID,
       CLUSTER_COLO_PROPERTY_ID,
       CLUSTER_INTERFACES_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java

@@ -45,7 +45,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * Resource provider for task attempt resources.
@@ -88,7 +88,7 @@ public class TaskAttemptResourceProvider extends
   /**
    * The key property ids for a TaskAttempt resource.
    */
-  protected static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  protected static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Cluster, TASK_ATTEMPT_CLUSTER_NAME_PROPERTY_ID)
       .put(Type.Workflow, TASK_ATTEMPT_WORKFLOW_ID_PROPERTY_ID)
       .put(Type.Job, TASK_ATTEMPT_JOB_ID_PROPERTY_ID)
@@ -98,7 +98,7 @@ public class TaskAttemptResourceProvider extends
   /**
    * The property ids for a TaskAttempt resource.
    */
-  protected static Set<String> propertyIds = Sets.newHashSet(
+  protected static final Set<String> propertyIds = ImmutableSet.of(
       TASK_ATTEMPT_CLUSTER_NAME_PROPERTY_ID,
       TASK_ATTEMPT_WORKFLOW_ID_PROPERTY_ID,
       TASK_ATTEMPT_JOB_ID_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java

@@ -115,7 +115,7 @@ public class TaskResourceProvider extends AbstractControllerResourceProvider {
   /**
    * The key property ids for a task resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.Cluster, TASK_CLUSTER_NAME_PROPERTY_ID)
       .put(Resource.Type.Request, TASK_REQUEST_ID_PROPERTY_ID)
       .put(Resource.Type.Upgrade, TASK_REQUEST_ID_PROPERTY_ID)
@@ -128,7 +128,7 @@ public class TaskResourceProvider extends AbstractControllerResourceProvider {
    * Used for querying tasks.
    */
   @Inject
-  protected static HostRoleCommandDAO s_dao;
+  static HostRoleCommandDAO s_dao;
 
   /**
    * Used for constructing instances of {@link HostRoleCommand} from {@link HostRoleCommandEntity}.
@@ -137,7 +137,7 @@ public class TaskResourceProvider extends AbstractControllerResourceProvider {
   private static HostRoleCommandFactory s_hostRoleCommandFactory;
 
   @Inject
-  protected static TopologyManager s_topologyManager;
+  static TopologyManager s_topologyManager;
 
   /**
    * Thread-safe Jackson JSON mapper.

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java

@@ -19,8 +19,6 @@
 package org.apache.ambari.server.controller.internal;
 
 import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
@@ -44,6 +42,9 @@ import org.apache.ambari.server.state.ThemeInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
 public class ThemeArtifactResourceProvider extends AbstractControllerResourceProvider {
 
   private static final Logger LOG = LoggerFactory.getLogger(ThemeArtifactResourceProvider.class);
@@ -58,34 +59,30 @@ public class ThemeArtifactResourceProvider extends AbstractControllerResourcePro
   /**
    * primary key fields
    */
-  public static Set<String> pkPropertyIds = new HashSet<>();
+  public static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+    .add(THEME_FILE_NAME_PROPERTY_ID)
+    .build();
   /**
    * map of resource type to fk field
    */
-  public static Map<Resource.Type, String> keyPropertyIds =
-    new HashMap<>();
+  public static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+    .put(Resource.Type.Theme, THEME_FILE_NAME_PROPERTY_ID)
+    .put(Resource.Type.Stack, STACK_NAME_PROPERTY_ID)
+    .put(Resource.Type.StackVersion, STACK_VERSION_PROPERTY_ID)
+    .put(Resource.Type.StackService, STACK_SERVICE_NAME_PROPERTY_ID)
+    .build();
 
   /**
    * resource properties
    */
-  public static Set<String> propertyIds = new HashSet<>();
-
-  static {
-    keyPropertyIds.put(Resource.Type.Theme, THEME_FILE_NAME_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.Stack, STACK_NAME_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.StackVersion, STACK_VERSION_PROPERTY_ID);
-    keyPropertyIds.put(Resource.Type.StackService, STACK_SERVICE_NAME_PROPERTY_ID);
-
-    pkPropertyIds.add(THEME_FILE_NAME_PROPERTY_ID);
-
-    // resource properties
-    propertyIds.add(STACK_NAME_PROPERTY_ID);
-    propertyIds.add(STACK_VERSION_PROPERTY_ID);
-    propertyIds.add(STACK_SERVICE_NAME_PROPERTY_ID);
-    propertyIds.add(THEME_FILE_NAME_PROPERTY_ID);
-    propertyIds.add(THEME_DEFAULT_PROPERTY_ID);
-    propertyIds.add(THEME_DATA_PROPERTY_ID);
-  }
+  public static final Set<String> propertyIds = ImmutableSet.<String>builder()
+    .add(STACK_NAME_PROPERTY_ID)
+    .add(STACK_VERSION_PROPERTY_ID)
+    .add(STACK_SERVICE_NAME_PROPERTY_ID)
+    .add(THEME_FILE_NAME_PROPERTY_ID)
+    .add(THEME_DEFAULT_PROPERTY_ID)
+    .add(THEME_DATA_PROPERTY_ID)
+    .build();
 
   /**
    * Create a  new resource provider for the given management controller.

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java

@@ -196,7 +196,6 @@ public class UpgradeItemResourceProvider extends ReadOnlyResourceProvider {
     Set<String> requestPropertyIds = getRequestPropertyIds(request, predicate);
 
     for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) {
-      String clusterName = (String) propertyMap.get(UPGRADE_CLUSTER_NAME);
       String requestIdStr = (String) propertyMap.get(UPGRADE_REQUEST_ID);
       String groupIdStr = (String) propertyMap.get(UPGRADE_GROUP_ID);
       String stageIdStr = (String) propertyMap.get(UPGRADE_ITEM_STAGE_ID);

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java

@@ -214,7 +214,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
   private static final Map<Resource.Type, String> KEY_PROPERTY_IDS = new HashMap<>();
 
   @Inject
-  protected static UpgradeDAO s_upgradeDAO = null;
+  static UpgradeDAO s_upgradeDAO;
 
   @Inject
   private static Provider<AmbariMetaInfo> s_metaProvider = null;

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java

@@ -57,6 +57,7 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Sets;
 
 /**
@@ -81,22 +82,22 @@ public class UserPrivilegeResourceProvider extends ReadOnlyResourceProvider {
   /**
    * Data access object used to obtain user entities.
    */
-  protected static UserDAO userDAO;
+  private static UserDAO userDAO;
 
   /**
    * Data access object used to obtain cluster entities.
    */
-  protected static ClusterDAO clusterDAO;
+  private static ClusterDAO clusterDAO;
 
   /**
    * Data access object used to obtain group entities.
    */
-  protected static GroupDAO groupDAO;
+  private static GroupDAO groupDAO;
 
   /**
    * Data access object used to obtain view instance entities.
    */
-  protected static ViewInstanceDAO viewInstanceDAO;
+  private static ViewInstanceDAO viewInstanceDAO;
 
   /**
    * Helper to obtain privilege data for requested users
@@ -106,7 +107,7 @@ public class UserPrivilegeResourceProvider extends ReadOnlyResourceProvider {
   /**
    * The property ids for a privilege resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       PRIVILEGE_ID,
       PERMISSION_NAME,
       PERMISSION_LABEL,
@@ -137,16 +138,14 @@ public class UserPrivilegeResourceProvider extends ReadOnlyResourceProvider {
   }
 
   @SuppressWarnings("serial")
-  private static Set<String> pkPropertyIds = new HashSet<String>() {
-    {
-      add(PRIVILEGE_ID);
-    }
-  };
+  private static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+    .add(PRIVILEGE_ID)
+    .build();
 
   /**
    * The key property ids for a privilege resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.User, USER_NAME)
       .put(Resource.Type.UserPrivilege, PRIVILEGE_ID)
       .build();
@@ -385,4 +384,4 @@ public class UserPrivilegeResourceProvider extends ReadOnlyResourceProvider {
     }
     return resource;
   }
-}
+}

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java

@@ -121,11 +121,11 @@ public class UserResourceProvider extends AbstractControllerResourceProvider imp
   /**
    * The key property ids for a User resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.User, USER_USERNAME_PROPERTY_ID)
       .build();
 
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       USER_USERNAME_PROPERTY_ID,
       USER_DISPLAY_NAME_PROPERTY_ID,
       USER_LOCAL_USERNAME_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java

@@ -81,7 +81,7 @@ public class ValidationResourceProvider extends StackAdvisorResourceProvider {
   /**
    * The key property ids for a Validation resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Type.Validation, VALIDATION_ID_PROPERTY_ID)
       .put(Type.Stack, STACK_NAME_PROPERTY_ID)
       .put(Type.StackVersion, STACK_VERSION_PROPERTY_ID)
@@ -90,7 +90,7 @@ public class ValidationResourceProvider extends StackAdvisorResourceProvider {
   /**
    * The property ids for a Validation resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       VALIDATION_ID_PROPERTY_ID,
       VALIDATE_PROPERTY_ID,
       ITEMS_PROPERTY_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java

@@ -111,7 +111,7 @@ public class ViewInstanceResourceProvider extends AbstractAuthorizedResourceProv
   /**
    * The key property ids for a view instance resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.View, VIEW_NAME)
       .put(Resource.Type.ViewVersion, VERSION)
       .put(Resource.Type.ViewInstance, INSTANCE_NAME)
@@ -120,7 +120,7 @@ public class ViewInstanceResourceProvider extends AbstractAuthorizedResourceProv
   /**
    * The property ids for a view instance resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
     VIEW_NAME,
     VERSION,
     INSTANCE_NAME,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java

@@ -50,7 +50,7 @@ public class ViewPermissionResourceProvider extends AbstractResourceProvider {
   /**
    * Data access object used to obtain permission entities.
    */
-  protected static PermissionDAO permissionDAO;
+  private static PermissionDAO permissionDAO;
 
   public static final String PERMISSION_INFO = "PermissionInfo";
 
@@ -69,7 +69,7 @@ public class ViewPermissionResourceProvider extends AbstractResourceProvider {
   /**
    * The key property ids for a permission resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.View, VIEW_NAME)
       .put(Resource.Type.ViewVersion, VERSION)
       .put(Resource.Type.ViewPermission, PERMISSION_ID)
@@ -78,7 +78,7 @@ public class ViewPermissionResourceProvider extends AbstractResourceProvider {
   /**
    * The property ids for a permission resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       VIEW_NAME,
       VERSION,
       PERMISSION_ID,

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPrivilegeResourceProvider.java

@@ -58,7 +58,7 @@ public class ViewPrivilegeResourceProvider extends PrivilegeResourceProvider<Vie
   /**
    * The property ids for a privilege resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(
+  private static final Set<String> propertyIds = Sets.newHashSet(
       VIEW_NAME,
       VERSION,
       INSTANCE_NAME,
@@ -71,7 +71,7 @@ public class ViewPrivilegeResourceProvider extends PrivilegeResourceProvider<Vie
   /**
    * The key property ids for a privilege resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
       .put(Resource.Type.View, VIEW_NAME)
       .put(Resource.Type.ViewVersion, VERSION)
       .put(Resource.Type.ViewInstance, INSTANCE_NAME)

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java

@@ -55,14 +55,14 @@ public class ViewResourceProvider extends AbstractAuthorizedResourceProvider {
   /**
    * The key property ids for a view resource.
    */
-  private static Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
+  private static final Map<Resource.Type, String> keyPropertyIds = ImmutableMap.<Resource.Type, String>builder()
     .put(Resource.Type.View, VIEW_NAME)
     .build();
 
   /**
    * The property ids for a view resource.
    */
-  private static Set<String> propertyIds = Sets.newHashSet(VIEW_NAME);
+  private static final Set<String> propertyIds = Sets.newHashSet(VIEW_NAME);
 
 
   // ----- Constructors ------------------------------------------------------