You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ad...@apache.org on 2018/09/29 06:41:05 UTC
[ambari] branch trunk updated: AMBARI-24245. Fix FindBugs warnings
(#2398)
This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3d782a0 AMBARI-24245. Fix FindBugs warnings (#2398)
3d782a0 is described below
commit 3d782a04ade55a7f0de5581de48cd75e6da67f71
Author: Doroszlai, Attila <64...@users.noreply.github.com>
AuthorDate: Sat Sep 29 08:40:57 2018 +0200
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 | 11 ++-
.../server/actionmanager/ActionDBAccessorImpl.java | 4 +-
.../server/actionmanager/ActionScheduler.java | 8 --
.../server/actionmanager/HostRoleStatus.java | 42 ++++++-----
.../ambari/server/agent/HeartbeatMonitor.java | 3 -
.../ambari/server/agent/HeartbeatProcessor.java | 1 -
.../ambari/server/agent/stomp/TopologyHolder.java | 2 -
.../api/query/render/ClusterBlueprintRenderer.java | 2 +-
.../resources/RepositoryResourceDefinition.java | 2 +-
.../api/resources/UpgradeResourceDefinition.java | 2 +-
.../ambari/server/api/services/BaseRequest.java | 2 +-
.../services/stackadvisor/StackAdvisorHelper.java | 4 -
.../services/stackadvisor/StackAdvisorRunner.java | 2 +-
...MetricsHadoopSinkVersionCompatibilityCheck.java | 4 +-
.../ambari/server/checks/CheckDescription.java | 86 +++++++++++-----------
.../checks/DatabaseConsistencyCheckHelper.java | 5 --
.../ambari/server/checks/MpackInstallChecker.java | 2 -
.../ambari/server/configuration/Configuration.java | 36 ++++-----
.../AmbariCustomCommandExecutionHelper.java | 19 ++---
.../controller/AmbariManagementControllerImpl.java | 9 +--
.../server/controller/AmbariManagementHelper.java | 1 -
.../server/controller/AuthToLocalBuilder.java | 2 +-
.../server/controller/KerberosHelperImpl.java | 24 ------
.../internal/AbstractResourceProvider.java | 2 +-
.../internal/ActionResourceProvider.java | 4 +-
.../ActiveWidgetLayoutResourceProvider.java | 39 +++++-----
.../internal/AlertDefinitionResourceProvider.java | 2 +-
.../internal/AlertHistoryResourceProvider.java | 2 +-
.../controller/internal/AlertResourceProvider.java | 4 +-
.../internal/AmbariPrivilegeResourceProvider.java | 4 +-
.../internal/ArtifactResourceProvider.java | 8 +-
.../internal/BlueprintConfigurationProcessor.java | 24 +++---
.../internal/BlueprintResourceProvider.java | 4 +-
.../internal/ClientConfigResourceProvider.java | 4 +-
.../internal/ClusterPrivilegeResourceProvider.java | 4 +-
.../internal/ClusterResourceProvider.java | 42 +++++------
.../ClusterStackVersionResourceProvider.java | 11 ++-
...ompatibleRepositoryVersionResourceProvider.java | 8 +-
.../internal/ComponentResourceProvider.java | 2 +-
.../internal/ConfigGroupResourceProvider.java | 6 +-
.../internal/ConfigurationResourceProvider.java | 2 +-
.../internal/ExportBlueprintRequest.java | 23 ------
.../internal/ExtensionLinkResourceProvider.java | 6 +-
.../internal/ExtensionResourceProvider.java | 4 +-
.../internal/ExtensionVersionResourceProvider.java | 4 +-
.../controller/internal/FeedResourceProvider.java | 4 +-
.../internal/GroupPrivilegeResourceProvider.java | 23 +++---
.../controller/internal/GroupResourceProvider.java | 4 +-
.../HostComponentProcessResourceProvider.java | 4 +-
.../internal/HostComponentResourceProvider.java | 6 +-
.../controller/internal/HostResourceProvider.java | 8 +-
.../internal/HostStackVersionResourceProvider.java | 6 +-
.../internal/InstanceResourceProvider.java | 4 +-
.../controller/internal/JobResourceProvider.java | 6 +-
.../KerberosDescriptorResourceProvider.java | 4 +-
.../internal/LdapSyncEventResourceProvider.java | 4 +-
.../internal/MemberResourceProvider.java | 4 +-
.../internal/OperatingSystemResourceProvider.java | 26 +++----
.../internal/PermissionResourceProvider.java | 6 +-
.../internal/PreUpgradeCheckResourceProvider.java | 18 ++---
.../internal/PrivilegeResourceProvider.java | 10 +--
.../internal/ProvisionClusterRequest.java | 2 +-
.../QuickLinkArtifactResourceProvider.java | 44 ++++++-----
.../internal/RecommendationResourceProvider.java | 4 +-
.../internal/RemoteClusterResourceProvider.java | 4 +-
.../internal/RepositoryResourceProvider.java | 78 ++++++++++----------
.../RepositoryVersionResourceProvider.java | 7 +-
.../internal/RequestResourceProvider.java | 8 +-
.../internal/RequestScheduleResourceProvider.java | 4 +-
.../RootServiceComponentResourceProvider.java | 4 +-
.../RootServiceHostComponentResourceProvider.java | 4 +-
.../internal/RootServiceResourceProvider.java | 4 +-
.../controller/internal/ScaleClusterRequest.java | 2 +-
.../ServiceConfigVersionResourceProvider.java | 2 +-
.../internal/ServiceResourceProvider.java | 2 +-
.../internal/SettingResourceProvider.java | 28 ++++---
.../internal/StackAdvisorResourceProvider.java | 2 +-
.../internal/StackArtifactResourceProvider.java | 41 +++++------
...ackConfigurationDependencyResourceProvider.java | 4 +-
.../StackConfigurationResourceProvider.java | 4 +-
.../internal/StackDependencyResourceProvider.java | 4 +-
.../StackLevelConfigurationResourceProvider.java | 4 +-
.../controller/internal/StackResourceProvider.java | 6 +-
.../StackServiceComponentResourceProvider.java | 4 +-
.../internal/StackServiceResourceProvider.java | 4 +-
.../internal/StackVersionResourceProvider.java | 6 +-
.../controller/internal/StageResourceProvider.java | 44 +++++------
.../internal/TargetClusterResourceProvider.java | 4 +-
.../internal/TaskAttemptResourceProvider.java | 6 +-
.../controller/internal/TaskResourceProvider.java | 6 +-
.../internal/ThemeArtifactResourceProvider.java | 43 +++++------
.../internal/UpgradeItemResourceProvider.java | 1 -
.../internal/UpgradeResourceProvider.java | 2 +-
.../internal/UserPrivilegeResourceProvider.java | 23 +++---
.../controller/internal/UserResourceProvider.java | 4 +-
.../internal/ValidationResourceProvider.java | 4 +-
.../internal/ViewInstanceResourceProvider.java | 4 +-
.../internal/ViewPermissionResourceProvider.java | 6 +-
.../internal/ViewPrivilegeResourceProvider.java | 4 +-
.../controller/internal/ViewResourceProvider.java | 4 +-
.../internal/ViewURLResourceProvider.java | 4 +-
.../internal/ViewVersionResourceProvider.java | 4 +-
.../internal/WidgetLayoutResourceProvider.java | 51 ++++++-------
.../internal/WidgetResourceProvider.java | 52 ++++++-------
.../internal/WorkflowResourceProvider.java | 4 +-
.../logging/LoggingRequestHelperImpl.java | 2 +-
.../metrics/ThreadPoolEnabledPropertyProvider.java | 2 -
.../metrics/ganglia/GangliaPropertyProvider.java | 2 +-
.../metrics/timeline/AMSPropertyProvider.java | 11 ++-
.../cache/TimelineMetricsCacheSizeOfEngine.java | 4 +-
.../controller/utilities/PropertyHelper.java | 10 ++-
.../state/DefaultServiceCalculatedState.java | 6 +-
.../ldap/domain/AmbariLdapConfiguration.java | 4 +-
.../ads/DefaultLdapConfigurationService.java | 4 +-
.../metadata/CachedRoleCommandOrderProvider.java | 8 +-
.../ambari/server/metadata/RoleCommandOrder.java | 4 +-
.../apache/ambari/server/orm/DBAccessorImpl.java | 2 +-
.../ambari/server/orm/dao/ExtensionLinkDAO.java | 2 +-
.../server/orm/entities/AlertDefinitionEntity.java | 6 +-
.../ambari/server/orm/entities/HostEntity.java | 11 +--
.../server/orm/entities/HostVersionEntity.java | 4 +-
.../ambari/server/orm/entities/WidgetEntity.java | 8 +-
.../server/orm/entities/WidgetLayoutEntity.java | 8 +-
.../entities/WidgetLayoutUserWidgetEntityPK.java | 7 +-
.../server/security/SecurePasswordHelper.java | 10 +--
.../upgrades/FinalizeUpgradeAction.java | 14 ++--
.../server/stack/ConfigurationDirectory.java | 6 +-
.../org/apache/ambari/server/stack/RepoUtil.java | 2 +-
.../apache/ambari/server/stack/StackContext.java | 2 +-
.../apache/ambari/server/stack/StackManager.java | 2 +-
.../server/stack/upgrade/ParallelScheduler.java | 4 +-
.../ambari/server/stack/upgrade/UpgradePack.java | 2 +-
.../stack/upgrade/orchestrate/UpgradeContext.java | 4 +-
.../org/apache/ambari/server/state/AlertState.java | 6 +-
.../ambari/server/state/ServiceComponentImpl.java | 28 +++----
.../server/state/alert/AlertDefinitionHash.java | 14 ++--
.../ambari/server/state/alert/MetricSource.java | 4 +
.../ambari/server/state/cluster/ClusterImpl.java | 2 +-
.../apache/ambari/server/state/host/HostImpl.java | 5 +-
.../state/repository/VersionDefinitionXml.java | 2 +-
.../server/state/stack/LatestRepoCallable.java | 2 +-
.../ambari/server/topology/AmbariContext.java | 2 +-
.../server/topology/BlueprintValidatorImpl.java | 2 -
.../apache/ambari/server/topology/Cardinality.java | 2 +-
.../ambari/server/topology/TopologyManager.java | 3 +-
.../ambari/server/upgrade/UpgradeCatalog270.java | 13 +---
.../org/apache/ambari/server/utils/JsonUtils.java | 2 +-
.../org/apache/ambari/server/utils/StageUtils.java | 46 ++++--------
.../server/view/configuration/ViewConfig.java | 2 +-
.../controller/AmbariManagementControllerTest.java | 7 +-
.../controller/internal/RequestImplTest.java | 2 +
.../metrics/JMXPropertyProviderTest.java | 6 +-
.../apache/ambari/server/orm/OrmTestHelper.java | 6 +-
.../ambari/server/orm/dao/AlertsDAOTest.java | 4 -
.../state/alerts/AlertEventPublisherTest.java | 7 +-
.../server/state/alerts/InitialAlertEventTest.java | 7 +-
.../ambari/server/state/cluster/ClusterTest.java | 1 -
157 files changed, 669 insertions(+), 822 deletions(-)
diff --git a/ambari-server/findbugs.exclude.xml b/ambari-server/findbugs.exclude.xml
index 74cd209..3020e62 100644
--- a/ambari-server/findbugs.exclude.xml
+++ b/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>
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
index 1a055b3..94aee41 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java
+++ b/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;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
index 2dfedb2..40d8577 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java
index 9685f83..0343f3b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/HostRoleStatus.java
+++ b/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;
}
/**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index d513622..007e49c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++ b/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<>();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index 4289f54..b7fea75 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
index 7224afc..8caa57a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/stomp/TopologyHolder.java
+++ b/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())
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
index acdf9ed..9713a59 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/render/ClusterBlueprintRenderer.java
+++ b/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;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RepositoryResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RepositoryResourceDefinition.java
index 2a01913..42f92cf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RepositoryResourceDefinition.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java
index 4304e0a..e4ee025 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/UpgradeResourceDefinition.java
+++ b/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.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
index ebfc62e..8588c31 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/BaseRequest.java
@@ -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
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java
index f6770bfa..abdc375 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorHelper.java
+++ b/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;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRunner.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRunner.java
index 556c2c9..395200b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/stackadvisor/StackAdvisorRunner.java
+++ b/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 {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java
index 622b103..979d448 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/AmbariMetricsHadoopSinkVersionCompatibilityCheck.java
+++ b/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)) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
index 5163dab..95d5d65 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/CheckDescription.java
+++ b/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>()
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
index 375bcd9..c1e8aa8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/DatabaseConsistencyCheckHelper.java
+++ b/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;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/MpackInstallChecker.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/MpackInstallChecker.java
index da83eb4..9437b27 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/MpackInstallChecker.java
+++ b/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 {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
index 09d90e8..de1e396 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java
+++ b/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() {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
index 30db434..b880766 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index f7e2ba4..fe851bc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
index e98c2e9..403e33f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementHelper.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java
index b301ed2..6e00108 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AuthToLocalBuilder.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
index fd8f9dc..23a0d96 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java
+++ b/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
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
index 40e1b2d..91e6d27 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractResourceProvider.java
+++ b/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 ------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
index 1adc55a..87e9694 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
index 628c2eb..a80bfd0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
+++ b/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<>();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
index 01f2d5d..0b6daf0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
+++ b/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();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java
index 759b5a8..0cc26a8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java
+++ b/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 {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
index dd1d6e0..72fe0ae 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertResourceProvider.java
+++ b/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 {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProvider.java
index 93c69bf..2dd4c7b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProvider.java
+++ b/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();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
index 567cfa9..2aca1cd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
+++ b/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
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
index 19c8e9f..2d580e4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintConfigurationProcessor.java
+++ b/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
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
index 020dbb9..a0fcd6f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index ed97b58..01e8f37 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProvider.java
index 75c1b71..b7b4a9e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProvider.java
+++ b/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();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
index 96823c2..4eeeea2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
+++ b/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 ----------------------------------------------------
/**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 2a6bbeb..bdcb85e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/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) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
index 04f250e..c400420 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CompatibleRepositoryVersionResourceProvider.java
+++ b/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)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
index b3abbf8..f0953b8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index 755a03a..30e2fc3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++ b/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) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java
index c924a62..cdf32b0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java
+++ b/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}));
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
index 16d3114..f15cd3e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExportBlueprintRequest.java
+++ b/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 --------------------------------------------
/**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java
index 1a4ffc2..bbdfc82 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionLinkResourceProvider.java
+++ b/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) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionResourceProvider.java
index 9ec4bab..b03b6ff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionResourceProvider.java
+++ b/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) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionVersionResourceProvider.java
index 0371058..9f8c7f7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ExtensionVersionResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java
index 82c781b..79acf71 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProvider.java
index 3c81906..e427d46 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProvider.java
+++ b/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;
}
-}
\ No newline at end of file
+}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
index 3da64ae..6601638 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java
index c85cdee..40a42e6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentProcessResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index 96197c0..d6f52a4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index 941297c..b8f1e2b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ b/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.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index 9391e64..6d15c39 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java
index 3d34982..6fb23b7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
index 93bf42a..f382ab9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java
index 773064d..d02d64a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
index ad7562a..52f7ded 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
index d4c1e03..5ec01ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/OperatingSystemResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/OperatingSystemResourceProvider.java
index 2310a28..bb47749 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/OperatingSystemResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
index dd9fa16..9832a36 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
index 5eb8b2e..5cc2631 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PreUpgradeCheckResourceProvider.java
+++ b/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.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
index e0bed9f..97ff062 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
+++ b/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";
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java
index 1fd6091..9fe4ee2 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ProvisionClusterRequest.java
+++ b/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());
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
index 534c369..2d9a256 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
+++ b/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.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java
index dcc6cb6..e1a58ef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RecommendationResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java
index 312fcb4..1d29f0b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RemoteClusterResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
index 82f7903..c09b45c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
index 1d90f22..81bf1fa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
+++ b/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)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
index d5222d2..c318775 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
+++ b/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) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java
index 18ce73b..5e8f849 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java
index 3c7fb6d..c08f595 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceComponentResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java
index 94c870b..683e528 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceHostComponentResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java
index dcc8970..4a043be 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootServiceResourceProvider.java
+++ b/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) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
index 5e5eec8..689208c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ScaleClusterRequest.java
+++ b/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()) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
index 24febe8..f860f2b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
+++ b/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}));
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index 7302833..8930cde 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ b/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}));
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java
index dd30904..f0803c8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
index cf716ea..37215d0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackAdvisorResourceProvider.java
+++ b/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";
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
index 292d4c1..5685392 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
+++ b/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.
*
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java
index 59341a0..4d82033 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationDependencyResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProvider.java
index 7b6c658..dc46ce9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackConfigurationResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java
index d28b5d9..f12a37c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java
index 7519da6..f8f1f07 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackLevelConfigurationResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java
index 59b42f1..2e63fa8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackResourceProvider.java
+++ b/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) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java
index 37c2efc..7993de4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceComponentResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
index fee94cb..7e07861 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackServiceResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
index f2e6d1a..97d6c24 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackVersionResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
index 0b9cd79..ac900a6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
+++ b/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 ------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java
index be28b54..9f6294d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
index a6df9be..ee02d5f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
index c81742f..9eed837 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
+++ b/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.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
index 46dd914..fa6f161 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
+++ b/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.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
index 02c9a99..485e303 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeItemResourceProvider.java
+++ b/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);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
index 6484a3c..9d1398f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java
+++ b/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;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java
index 7d66b48..37b4b5d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProvider.java
+++ b/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;
}
-}
\ No newline at end of file
+}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
index 1177b57..73b7601 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java
index 7252212..88b796b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ValidationResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java
index 4ecc1d0..2cdfe81 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java
index c67cb5c..64494a8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java
+++ b/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,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPrivilegeResourceProvider.java
index 50512df..b96710e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPrivilegeResourceProvider.java
+++ b/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)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java
index d857cfe..8b7dfff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java
+++ b/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 ------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewURLResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewURLResourceProvider.java
index 8267492..73c0f8d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewURLResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewURLResourceProvider.java
@@ -75,14 +75,14 @@ public class ViewURLResourceProvider extends AbstractAuthorizedResourceProvider
/**
* The key property ids for a view URL 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.ViewURL, URL_NAME)
.build();
/**
* The property ids for a view URL resource.
*/
- private static Set<String> propertyIds = Sets.newHashSet(
+ private static final Set<String> propertyIds = Sets.newHashSet(
URL_NAME,
URL_SUFFIX,
VIEW_INSTANCE_VERSION,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
index 02c7544..992edfd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
@@ -87,7 +87,7 @@ public class ViewVersionResourceProvider extends AbstractResourceProvider {
/**
* 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
)
.put(Resource.Type.ViewVersion, VERSION
@@ -97,7 +97,7 @@ public class ViewVersionResourceProvider extends AbstractResourceProvider {
/**
* The property ids for a view resource.
*/
- private static Set<String> propertyIds = Sets.newHashSet(
+ private static final Set<String> propertyIds = Sets.newHashSet(
VIEW_NAME,
VERSION,
BUILD_NUMBER,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
index 5af2acc..3d74c52 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
@@ -52,6 +52,8 @@ import org.apache.ambari.server.orm.entities.WidgetLayoutUserWidgetEntity;
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;
/**
@@ -76,37 +78,31 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
}
@SuppressWarnings("serial")
- private static Set<String> pkPropertyIds = new HashSet<String>() {
- {
- add(WIDGETLAYOUT_ID_PROPERTY_ID);
- }
- };
+ private static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+ .add(WIDGETLAYOUT_ID_PROPERTY_ID)
+ .build();
@SuppressWarnings("serial")
- private static ReadWriteLock lock = new ReentrantReadWriteLock();
+ private static final ReadWriteLock lock = new ReentrantReadWriteLock();
@SuppressWarnings("serial")
- public static Set<String> propertyIds = new HashSet<String>() {
- {
- 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);
- }
- };
+ 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)
+ .build();
@SuppressWarnings("serial")
- public static Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
- {
- put(Type.WidgetLayout, WIDGETLAYOUT_ID_PROPERTY_ID);
- put(Type.Cluster, WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID);
- put(Type.User, WIDGETLAYOUT_USERNAME_PROPERTY_ID);
- }
- };
+ public static final Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String>builder()
+ .put(Type.WidgetLayout, WIDGETLAYOUT_ID_PROPERTY_ID)
+ .put(Type.Cluster, WIDGETLAYOUT_CLUSTER_NAME_PROPERTY_ID)
+ .put(Type.User, WIDGETLAYOUT_USERNAME_PROPERTY_ID)
+ .build();
@Inject
private static WidgetDAO widgetDAO;
@@ -201,14 +197,11 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
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<WidgetEntity> widgetEntities = new ArrayList<>();
List<WidgetLayoutEntity> layoutEntities = new ArrayList<>();
for (Map<String, Object> propertyMap: propertyMaps) {
- String userName = getUserName(propertyMap);
if (propertyMap.get(WIDGETLAYOUT_ID_PROPERTY_ID) != null) {
final Long id;
try {
@@ -229,7 +222,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
for (WidgetLayoutEntity layoutEntity : layoutEntities) {
Resource resource = new ResourceImpl(Type.WidgetLayout);
resource.setProperty(WIDGETLAYOUT_ID_PROPERTY_ID, layoutEntity.getId());
- String clusterName = null;
+ String clusterName;
try {
clusterName = getManagementController().getClusters().getClusterById(layoutEntity.getClusterId()).getClusterName();
} catch (AmbariException e) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
index 93042e4..751cfee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
@@ -51,6 +51,8 @@ import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.security.access.AccessDeniedException;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.gson.Gson;
import com.google.inject.Inject;
@@ -80,38 +82,32 @@ public class WidgetResourceProvider extends AbstractControllerResourceProvider {
}
@SuppressWarnings("serial")
- private static Set<String> pkPropertyIds = new HashSet<String>() {
- {
- add(WIDGET_ID_PROPERTY_ID);
- }
- };
+ private static final Set<String> pkPropertyIds = ImmutableSet.<String>builder()
+ .add(WIDGET_ID_PROPERTY_ID)
+ .build();
@SuppressWarnings("serial")
- public static Set<String> propertyIds = new HashSet<String>() {
- {
- add(WIDGET_ID_PROPERTY_ID);
- add(WIDGET_WIDGET_NAME_PROPERTY_ID);
- add(WIDGET_WIDGET_TYPE_PROPERTY_ID);
- add(WIDGET_TIME_CREATED_PROPERTY_ID);
- add(WIDGET_CLUSTER_NAME_PROPERTY_ID);
- add(WIDGET_AUTHOR_PROPERTY_ID);
- add(WIDGET_DESCRIPTION_PROPERTY_ID);
- add(WIDGET_SCOPE_PROPERTY_ID);
- add(WIDGET_METRICS_PROPERTY_ID);
- add(WIDGET_VALUES_PROPERTY_ID);
- add(WIDGET_PROPERTIES_PROPERTY_ID);
- add(WIDGET_TAG_PROPERTY_ID);
- }
- };
+ public static final Set<String> propertyIds = ImmutableSet.<String>builder()
+ .add(WIDGET_ID_PROPERTY_ID)
+ .add(WIDGET_WIDGET_NAME_PROPERTY_ID)
+ .add(WIDGET_WIDGET_TYPE_PROPERTY_ID)
+ .add(WIDGET_TIME_CREATED_PROPERTY_ID)
+ .add(WIDGET_CLUSTER_NAME_PROPERTY_ID)
+ .add(WIDGET_AUTHOR_PROPERTY_ID)
+ .add(WIDGET_DESCRIPTION_PROPERTY_ID)
+ .add(WIDGET_SCOPE_PROPERTY_ID)
+ .add(WIDGET_METRICS_PROPERTY_ID)
+ .add(WIDGET_VALUES_PROPERTY_ID)
+ .add(WIDGET_PROPERTIES_PROPERTY_ID)
+ .add(WIDGET_TAG_PROPERTY_ID)
+ .build();
@SuppressWarnings("serial")
- public static Map<Type, String> keyPropertyIds = new HashMap<Type, String>() {
- {
- put(Type.Widget, WIDGET_ID_PROPERTY_ID);
- put(Type.Cluster, WIDGET_CLUSTER_NAME_PROPERTY_ID);
- put(Type.User, WIDGET_AUTHOR_PROPERTY_ID);
- }
- };
+ public static final Map<Type, String> keyPropertyIds = ImmutableMap.<Type, String>builder()
+ .put(Type.Widget, WIDGET_ID_PROPERTY_ID)
+ .put(Type.Cluster, WIDGET_CLUSTER_NAME_PROPERTY_ID)
+ .put(Type.User, WIDGET_AUTHOR_PROPERTY_ID)
+ .build();
@Inject
private static WidgetDAO widgetDAO;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
index af1085f..0fa7db0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
@@ -86,7 +86,7 @@ public class WorkflowResourceProvider extends
/**
* The key property ids for a Workflow 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.Cluster, WORKFLOW_CLUSTER_NAME_PROPERTY_ID)
.put(Type.Workflow, WORKFLOW_ID_PROPERTY_ID)
.build();
@@ -94,7 +94,7 @@ public class WorkflowResourceProvider extends
/**
* The property ids for a Workflow resource.
*/
- private static Set<String> propertyIds = Sets.newHashSet(
+ private static final Set<String> propertyIds = Sets.newHashSet(
WORKFLOW_CLUSTER_NAME_PROPERTY_ID,
WORKFLOW_ID_PROPERTY_ID,
WORKFLOW_NAME_PROPERTY_ID,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
index a0b027a..88b7fe9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/logging/LoggingRequestHelperImpl.java
@@ -439,7 +439,7 @@ public class LoggingRequestHelperImpl implements LoggingRequestHelper {
} else {
uriBuilder.setScheme(scheme);
uriBuilder.setHost(hostName);
- uriBuilder.setPort(Integer.valueOf(portNumber));
+ uriBuilder.setPort(Integer.parseInt(portNumber));
}
return uriBuilder;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java
index d571dae..f75ad24 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ThreadPoolEnabledPropertyProvider.java
@@ -79,8 +79,6 @@ public abstract class ThreadPoolEnabledPropertyProvider extends AbstractProperty
private static final Logger LOG = LoggerFactory.getLogger(ThreadPoolEnabledPropertyProvider.class);
- protected static Configuration configuration;
-
/**
* Host states that make available metrics collection
*/
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java
index ac0c590..fc83671 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/ganglia/GangliaPropertyProvider.java
@@ -452,7 +452,7 @@ public abstract class GangliaPropertyProvider extends MetricsPropertyProvider {
while(val!=null && !"[~EOM]".equals(val)) {
if (val.startsWith("[~r]")) {
- Integer repeat = Integer.valueOf(val.substring(4)) - 1;
+ int repeat = Integer.parseInt(val.substring(4)) - 1;
for (int i = 0; i < repeat; ++i) {
if (! "[~n]".equals(lastVal)) {
GangliaMetric.TemporalMetric tm = new GangliaMetric.TemporalMetric(lastVal, time);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
index ffe8e11..38e1f10 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/AMSPropertyProvider.java
@@ -69,6 +69,7 @@ import org.apache.http.client.utils.URIBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Sets;
public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
@@ -81,15 +82,13 @@ public abstract class AMSPropertyProvider extends MetricsPropertyProvider {
private static AtomicInteger printSkipPopulateMsgHostCompCounter = new AtomicInteger(0);
private static final Map<String, String> timelineAppIdCache = new ConcurrentHashMap<>(10);
- private static final Map<String, String> JVM_PROCESS_NAMES = new HashMap<>(2);
+ private static final Map<String, String> JVM_PROCESS_NAMES = ImmutableMap.<String, String>builder()
+ .put("HBASE_MASTER", "Master.")
+ .put("HBASE_REGIONSERVER", "RegionServer.")
+ .build();
private AmbariEventPublisher ambariEventPublisher;
- static {
- JVM_PROCESS_NAMES.put("HBASE_MASTER", "Master.");
- JVM_PROCESS_NAMES.put("HBASE_REGIONSERVER", "RegionServer.");
- }
-
public AMSPropertyProvider(Map<String, Map<String, PropertyInfo>> componentPropertyInfoMap,
URLStreamProvider streamProvider,
ComponentSSLConfiguration configuration,
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java
index baae751..f3cc703 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/metrics/timeline/cache/TimelineMetricsCacheSizeOfEngine.java
@@ -38,8 +38,8 @@ import net.sf.ehcache.pool.sizeof.SizeOf;
public class TimelineMetricsCacheSizeOfEngine implements SizeOfEngine {
private final static Logger LOG = LoggerFactory.getLogger(TimelineMetricsCacheSizeOfEngine.class);
- public static int DEFAULT_MAX_DEPTH = 1000;
- public static boolean DEFAULT_ABORT_WHEN_MAX_DEPTH_EXCEEDED = false;
+ public static final int DEFAULT_MAX_DEPTH = 1000;
+ public static final boolean DEFAULT_ABORT_WHEN_MAX_DEPTH_EXCEEDED = false;
private SizeOfEngine underlying = null;
SizeOf reflectionSizeOf = new ReflectionSizeOf();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
index a63983c..8aaffe8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/PropertyHelper.java
@@ -39,6 +39,8 @@ import org.apache.commons.lang.StringUtils;
import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
+import com.google.common.collect.ImmutableList;
+
/**
* Utility class that provides Property helper methods.
*/
@@ -53,10 +55,10 @@ public class PropertyHelper {
* Aggregate functions implicitly supported by the Metrics Service
*/
public static final List<String> AGGREGATE_FUNCTION_IDENTIFIERS =
- Arrays.asList("._sum", "._max", "._min", "._avg", "._rate");
+ ImmutableList.of("._sum", "._max", "._min", "._avg", "._rate");
private static final List<Resource.InternalType> REPORT_METRIC_RESOURCES =
- Arrays.asList(Resource.InternalType.Cluster, Resource.InternalType.Host);
+ ImmutableList.of(Resource.InternalType.Cluster, Resource.InternalType.Host);
private static final Map<Resource.InternalType, Set<String>> PROPERTY_IDS = new HashMap<>();
private static final Map<Resource.InternalType, Map<String, Map<String, PropertyInfo>>> JMX_PROPERTY_IDS = readPropertyProviderIds(JMX_PROPERTIES_FILE);
@@ -93,8 +95,8 @@ public class PropertyHelper {
private static final Pattern METRIC_CATEGORY_TOKENIZE_REGEX = Pattern.compile("/+(?=([^\"\\\\\\\\]*(\\\\\\\\.|\"([^\"\\\\\\\\]*\\\\\\\\.)*[^\"\\\\\\\\]*\"))*[^\"]*$)");
static {
- RPC_METRIC_SUFFIXES.put("metrics/rpc/", Arrays.asList("client", "datanode", "healthcheck"));
- RPC_METRIC_SUFFIXES.put("metrics/rpcdetailed/", Arrays.asList("client", "datanode", "healthcheck"));
+ RPC_METRIC_SUFFIXES.put("metrics/rpc/", ImmutableList.of("client", "datanode", "healthcheck"));
+ RPC_METRIC_SUFFIXES.put("metrics/rpcdetailed/", ImmutableList.of("client", "datanode", "healthcheck"));
}
public static String getPropertyId(String category, String name) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
index 56117ed..c7d541d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/utilities/state/DefaultServiceCalculatedState.java
@@ -58,10 +58,10 @@ public class DefaultServiceCalculatedState implements ServiceCalculatedState {
private static final Logger LOG = LoggerFactory.getLogger(DefaultServiceCalculatedState.class);
@Inject
- protected static Provider<Clusters> clustersProvider = null;
+ private static Provider<Clusters> clustersProvider;
@Inject
- protected static Provider<AmbariManagementController> managementControllerProvider = null;
+ static Provider<AmbariManagementController> managementControllerProvider;
// Get the State of a host component
@@ -121,7 +121,7 @@ public class DefaultServiceCalculatedState implements ServiceCalculatedState {
hasDisabled = true;
}
- if (isInMaintenance & !componentInfo.isClient()) {
+ if (isInMaintenance && !componentInfo.isClient()) {
hasMM = true;
if ( maxMMState == null || state.ordinal() > maxMMState.ordinal()) {
maxMMState = state;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
index b8216b1..fe99a35 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/domain/AmbariLdapConfiguration.java
@@ -76,7 +76,7 @@ public class AmbariLdapConfiguration {
}
public int serverPort() {
- return Integer.valueOf(configValue(AmbariServerConfigurationKey.SERVER_PORT));
+ return Integer.parseInt(configValue(AmbariServerConfigurationKey.SERVER_PORT));
}
public String serverUrl() {
@@ -89,7 +89,7 @@ public class AmbariLdapConfiguration {
public int secondaryServerPort() {
final String secondaryServerPort = configValue(AmbariServerConfigurationKey.SECONDARY_SERVER_PORT);
- return secondaryServerPort == null ? 0 : Integer.valueOf(secondaryServerPort);
+ return secondaryServerPort == null ? 0 : Integer.parseInt(secondaryServerPort);
}
public String secondaryServerUrl() {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java
index 47e758c..a1a6d06 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ldap/service/ads/DefaultLdapConfigurationService.java
@@ -38,8 +38,6 @@ import org.apache.directory.ldap.client.template.LdapConnectionTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Lists;
-
/**
* Implementation of the validation logic using the Apache Directory API.
*/
@@ -131,7 +129,7 @@ public class DefaultLdapConfigurationService implements LdapConfigurationService
*/
@Override
public Set<String> checkGroupAttributes(String userDn, AmbariLdapConfiguration ambariLdapConfiguration) throws AmbariLdapException {
- List<String> groups = Lists.newArrayList();
+ List<String> groups;
try {
LOGGER.info("Checking group attributes for user dn: [{}] ...", userDn);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
index 096a395..316b97c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metadata/CachedRoleCommandOrderProvider.java
@@ -97,8 +97,12 @@ public class CachedRoleCommandOrderProvider implements RoleCommandOrderProvider
} catch (AmbariException ignored) {
}
- int clusterCacheId = new HashCodeBuilder().append(cluster.getClusterId()).append(hasGLUSTERFS).append(isNameNodeHAEnabled).append
- (isResourceManagerHAEnabled).toHashCode();
+ int clusterCacheId = new HashCodeBuilder()
+ .append(cluster != null ? cluster.getClusterId() : -1)
+ .append(hasGLUSTERFS)
+ .append(isNameNodeHAEnabled)
+ .append(isResourceManagerHAEnabled)
+ .toHashCode();
RoleCommandOrder rco = rcoMap.get(clusterCacheId);
if (rco == null) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
index 20edcfd..b748a2b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/metadata/RoleCommandOrder.java
@@ -139,12 +139,12 @@ public class RoleCommandOrder implements Cloneable {
}
for (StackId stackId : stackIds) {
- StackInfo stack = null;
+ StackInfo stack;
try {
stack = ambariMetaInfo.getStack(stackId.getStackName(),
stackId.getStackVersion());
} catch (AmbariException ignored) {
- // initialize() will fail with NPE
+ throw new NullPointerException("Stack not found: " + stackId);
}
Map<String,Object> userData = stack.getRoleCommandOrder().getContent();
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
index 34f44f6..72bcfdf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessorImpl.java
@@ -341,7 +341,7 @@ public class DBAccessorImpl implements DBAccessor {
if (!duplicatedColumns.isEmpty()) {
throw new IllegalStateException(
String.format("Request for columns [%s] existing in table [%s] returned too many results [%s] for columns [%s]",
- columnName, tableName, duplicatedColumns.size(), duplicatedColumns.toString()));
+ Arrays.toString(columnName), tableName, duplicatedColumns.size(), duplicatedColumns.toString()));
}
return columnsList.size() == 0;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java
index e295165..16b9d4e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java
@@ -65,7 +65,7 @@ public class ExtensionLinkDAO {
@RequiresSession
public List<ExtensionLinkEntity> find(ExtensionLinkRequest request) {
if (request.getLinkId() != null) {
- ExtensionLinkEntity entity = findById(new Long(request.getLinkId()));
+ ExtensionLinkEntity entity = findById(Long.parseLong(request.getLinkId()));
List<ExtensionLinkEntity> list = new ArrayList<>();
list.add(entity);
return list;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
index afa9684..8b880ff 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java
@@ -310,7 +310,7 @@ public class AlertDefinitionEntity {
* otherwise.
*/
public boolean getEnabled() {
- return enabled == Integer.valueOf(0) ? false : true;
+ return !Objects.equals(enabled, 0);
}
/**
@@ -332,7 +332,7 @@ public class AlertDefinitionEntity {
* otherwise.
*/
public boolean isHostIgnored() {
- return ignoreHost == Integer.valueOf(0) ? false : true;
+ return !Objects.equals(ignoreHost, 0);
}
/**
@@ -530,7 +530,7 @@ public class AlertDefinitionEntity {
* value.
*/
public boolean isRepeatToleranceEnabled() {
- return repeatToleranceEnabled == Short.valueOf((short) 0) ? false : true;
+ return !Objects.equals(repeatToleranceEnabled, (short) 0);
}
/**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java
index c5dd342..831d39c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostEntity.java
@@ -22,6 +22,7 @@ import static org.apache.commons.lang.StringUtils.defaultString;
import java.util.Collection;
import java.util.Collections;
+import java.util.Objects;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
@@ -285,7 +286,8 @@ public class HostEntity implements Comparable<HostEntity> {
HostEntity that = (HostEntity) o;
- return getHostId() == that.getHostId() && hostName.equals(that.hostName);
+ return Objects.equals(getHostId(), that.getHostId()) &&
+ Objects.equals(hostName, that.hostName);
}
/**
@@ -293,12 +295,7 @@ public class HostEntity implements Comparable<HostEntity> {
*/
@Override
public int hashCode() {
- int result = null != getHostId() ? getHostId().hashCode() : 0;
- if (null != hostName) {
- result = 31 * result + hostName.hashCode();
- }
-
- return result;
+ return Objects.hash(getHostId(), hostName);
}
@Override
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
index 2c61a3c..536d867 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/HostVersionEntity.java
@@ -18,6 +18,8 @@
package org.apache.ambari.server.orm.entities;
+import java.util.Objects;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.EnumType;
@@ -201,7 +203,7 @@ public class HostVersionEntity {
}
HostVersionEntity other = (HostVersionEntity) obj;
- if (id != null ? id != other.id : other.id != null) {
+ if (!Objects.equals(id, other.id)) {
return false;
}
if (hostEntity != null ? !hostEntity.equals(other.hostEntity) : other.hostEntity != null) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java
index 2762f14..ba49632 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetEntity.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.orm.entities;
import java.util.List;
+import java.util.Objects;
import javax.persistence.Basic;
import javax.persistence.CascadeType;
@@ -256,15 +257,12 @@ public class WidgetEntity {
WidgetEntity that = (WidgetEntity) o;
- if (id != that.id) return false;
-
- return true;
+ return Objects.equals(id, that.id);
}
@Override
public int hashCode() {
- int result = null != id ? id.hashCode() : 0;
- return result;
+ return Objects.hashCode(id);
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java
index 1fa45e9..3462dbe 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutEntity.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.orm.entities;
import java.util.List;
+import java.util.Objects;
import javax.persistence.CascadeType;
import javax.persistence.Column;
@@ -163,15 +164,12 @@ public class WidgetLayoutEntity {
WidgetLayoutEntity that = (WidgetLayoutEntity) o;
- if (id != that.id) return false;
-
- return true;
+ return Objects.equals(id, that.id);
}
@Override
public int hashCode() {
- int result = null != id ? id.hashCode() : 0;
- return result;
+ return Objects.hashCode(id);
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutUserWidgetEntityPK.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutUserWidgetEntityPK.java
index 79ab3ff..0850138 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutUserWidgetEntityPK.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/WidgetLayoutUserWidgetEntityPK.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.orm.entities;
import java.io.Serializable;
+import java.util.Objects;
import javax.persistence.Column;
import javax.persistence.Id;
@@ -56,10 +57,8 @@ public class WidgetLayoutUserWidgetEntityPK implements Serializable {
WidgetLayoutUserWidgetEntityPK that = (WidgetLayoutUserWidgetEntityPK) o;
- if (widgetLayoutId != that.widgetLayoutId) return false;
- if (userWidgetId != that.userWidgetId) return false;
-
- return true;
+ return Objects.equals(widgetLayoutId, that.widgetLayoutId) &&
+ Objects.equals(userWidgetId, that.userWidgetId);
}
@Override
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/SecurePasswordHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/security/SecurePasswordHelper.java
index 5849bdd..6e89ddf 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/security/SecurePasswordHelper.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/security/SecurePasswordHelper.java
@@ -55,23 +55,23 @@ public class SecurePasswordHelper {
/**
* The set of available lowercase letters to use when generating a secure password
*/
- protected final static char[] SECURE_PASSWORD_CHARACTER_CLASS_LOWERCASE_LETTERS = "abcdefghijklmnopqrstuvwxyz".toCharArray();
+ final static char[] SECURE_PASSWORD_CHARACTER_CLASS_LOWERCASE_LETTERS = "abcdefghijklmnopqrstuvwxyz".toCharArray();
/**
* The set of available uppercase letters to use when generating a secure password
*/
- protected final static char[] SECURE_PASSWORD_CHARACTER_CLASS_UPPERCASE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
+ final static char[] SECURE_PASSWORD_CHARACTER_CLASS_UPPERCASE_LETTERS = "ABCDEFGHIJKLMNOPQRSTUVWXYZ".toCharArray();
/**
* The set of available digits to use when generating a secure password
*/
- protected final static char[] SECURE_PASSWORD_CHARACTER_CLASS_DIGITS = "0123456789".toCharArray();
+ final static char[] SECURE_PASSWORD_CHARACTER_CLASS_DIGITS = "0123456789".toCharArray();
/**
* The set of available punctuation characters to use when generating a secure password
*/
- protected final static char[] SECURE_PASSWORD_CHARACTER_CLASS_PUNCTUATION = "?.!$%^*()-_+=~".toCharArray();
+ final static char[] SECURE_PASSWORD_CHARACTER_CLASS_PUNCTUATION = "?.!$%^*()-_+=~".toCharArray();
/**
* The set of available whitespace characters to use when generating a secure password
*/
- protected final static char[] SECURE_PASSWORD_CHARACTER_CLASS_WHITESPACE = " ".toCharArray();
+ final static char[] SECURE_PASSWORD_CHARACTER_CLASS_WHITESPACE = " ".toCharArray();
/**
* The collection of available character classes
*/
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
index 0e62702..2b75565 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java
@@ -208,9 +208,9 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction {
// mark revertable
if (repositoryType.isRevertable() && direction == Direction.UPGRADE) {
- UpgradeEntity upgrade = cluster.getUpgradeInProgress();
- upgrade.setRevertAllowed(true);
- upgrade = m_upgradeDAO.merge(upgrade);
+ UpgradeEntity upgradeEntity = cluster.getUpgradeInProgress();
+ upgradeEntity.setRevertAllowed(true);
+ upgradeEntity = m_upgradeDAO.merge(upgradeEntity);
}
// Reset upgrade state
@@ -425,11 +425,11 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction {
List<HostVersionEntity> currentHostVersions = hostVersionDAO.findByClusterAndState(
cluster.getClusterName(), RepositoryVersionState.CURRENT);
- for (HostVersionEntity hostVersion : currentHostVersions) {
- RepositoryVersionEntity hostRepoVersion = hostVersion.getRepositoryVersion();
+ for (HostVersionEntity hostVersionEntity : currentHostVersions) {
+ RepositoryVersionEntity hostRepoVersion = hostVersionEntity.getRepositoryVersion();
if (!desiredRepoVersions.contains(hostRepoVersion)) {
- hostVersion.setState(RepositoryVersionState.INSTALLED);
- hostVersion = hostVersionDAO.merge(hostVersion);
+ hostVersionEntity.setState(RepositoryVersionState.INSTALLED);
+ hostVersionEntity = hostVersionDAO.merge(hostVersionEntity);
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java
index cf5a678..09b6389 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/ConfigurationDirectory.java
@@ -178,7 +178,11 @@ public class ConfigurationDirectory extends StackDefinitionDirectory {
LOG.error("Failed to load value from property file. Properties file {} does not exist", propertyFilePath);
}
} else {
- LOG.error("Failed to load value from property file. Properties directory {} does not exist", propertiesDirFile.getAbsolutePath());
+ if (propertiesDirFile == null) {
+ LOG.error("Failed to load value from property file. Properties directory is null");
+ } else {
+ LOG.error("Failed to load value from property file. Properties directory {} does not exist", propertiesDirFile.getAbsolutePath());
+ }
}
}
props.add(pi);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java
index 6c13a13..a12b526 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/RepoUtil.java
@@ -70,7 +70,7 @@ public class RepoUtil {
private static final Function<RepoDefinitionEntity, String> REPO_ENTITY_TO_NAME = new Function<RepoDefinitionEntity, String>() {
@Override
- public String apply(@Nullable RepoDefinitionEntity input) {
+ public String apply(RepoDefinitionEntity input) {
return input.getRepoName();
}
};
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java
index 2992027..fbf114d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackContext.java
@@ -168,7 +168,7 @@ public class StackContext {
public void execute() {
long currentTime = System.nanoTime();
- List<Future<Map<StackModule, RepoUrlInfoResult>>> results = new ArrayList<>();
+ List<Future<Map<StackModule, RepoUrlInfoResult>>> results;
// !!! first, load the *_urlinfo.json files and block for completion
try {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
index 3473fe8..6c17a6b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackManager.java
@@ -73,7 +73,7 @@ public class StackManager {
* HDP/2.0.6/HDFS
* common-services/HDFS/2.1.0.2.0
*/
- public static String PATH_DELIMITER = "/";
+ public static final String PATH_DELIMITER = "/";
/**
* Prefix used for common services parent path string
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ParallelScheduler.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ParallelScheduler.java
index 3181544..43e22ee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ParallelScheduler.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/ParallelScheduler.java
@@ -24,8 +24,8 @@ import javax.xml.bind.annotation.XmlElement;
*/
public class ParallelScheduler {
- // This setting can be overriden using ambari.properties file
- public static int DEFAULT_MAX_DEGREE_OF_PARALLELISM = Integer.MAX_VALUE;
+ // This setting can be overridden using ambari.properties file
+ public static final int DEFAULT_MAX_DEGREE_OF_PARALLELISM = Integer.MAX_VALUE;
@XmlElement(name="max-degree-of-parallelism")
public int maxDegreeOfParallelism = DEFAULT_MAX_DEGREE_OF_PARALLELISM;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java
index 7530670..7f26bf0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/UpgradePack.java
@@ -314,7 +314,7 @@ public class UpgradePack {
* @return the list of groups
*/
public List<Grouping> getGroups(Direction direction) {
- List<Grouping> list = new ArrayList<>();
+ List<Grouping> list;
if (direction.isUpgrade()) {
list = groups;
} else {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java
index ef381e1..f149244 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/upgrade/orchestrate/UpgradeContext.java
@@ -331,7 +331,7 @@ public class UpgradeContext {
m_isRevert = upgradeRequestMap.containsKey(UPGRADE_REVERT_UPGRADE_ID);
if (m_isRevert) {
- m_revertUpgradeId = Long.valueOf(upgradeRequestMap.get(UPGRADE_REVERT_UPGRADE_ID).toString());
+ m_revertUpgradeId = Long.parseLong(upgradeRequestMap.get(UPGRADE_REVERT_UPGRADE_ID).toString());
UpgradeEntity revertUpgrade = m_upgradeDAO.findUpgrade(m_revertUpgradeId);
UpgradeEntity revertableUpgrade = m_upgradeDAO.findRevertable(cluster.getClusterId());
@@ -1080,7 +1080,7 @@ public class UpgradeContext {
RepositoryVersionEntity repositoryVersion) throws AmbariException {
// keep track of the services which will be in this upgrade
- Set<String> servicesForUpgrade = new HashSet<>();
+ Set<String> servicesForUpgrade;
// standard repo types use all services of the cluster
if (repositoryVersion.getType() == RepositoryType.STANDARD) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/AlertState.java b/ambari-server/src/main/java/org/apache/ambari/server/state/AlertState.java
index b9aa672..99e314b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/AlertState.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/AlertState.java
@@ -17,7 +17,9 @@
*/
package org.apache.ambari.server.state;
-import java.util.EnumSet;
+import java.util.Set;
+
+import com.google.common.collect.Sets;
/**
* Represents the state of an alert.
@@ -50,7 +52,7 @@ public enum AlertState {
*/
SKIPPED(4);
- public static EnumSet<AlertState> RECALCULATE_AGGREGATE_ALERT_STATES = EnumSet.of(CRITICAL, WARNING);
+ public static final Set<AlertState> RECALCULATE_AGGREGATE_ALERT_STATES = Sets.immutableEnumSet(CRITICAL, WARNING);
private final int intValue;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
index e9c2e77..9cfe8c8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ServiceComponentImpl.java
@@ -647,7 +647,7 @@ public class ServiceComponentImpl implements ServiceComponent {
@Transactional
public void updateRepositoryState(String reportedVersion) throws AmbariException {
- ServiceComponentDesiredStateEntity component = serviceComponentDesiredStateDAO.findById(
+ ServiceComponentDesiredStateEntity serviceComponentDesiredStateEntity = serviceComponentDesiredStateDAO.findById(
desiredStateEntityId);
List<ServiceComponentVersionEntity> componentVersions = serviceComponentDesiredStateDAO.findVersions(
@@ -680,10 +680,10 @@ public class ServiceComponentImpl implements ServiceComponent {
componentVersion.setUserName("auto-reported");
// since we've never seen this version before, mark the component as CURRENT
- component.setRepositoryState(RepositoryVersionState.CURRENT);
- component.addVersion(componentVersion);
+ serviceComponentDesiredStateEntity.setRepositoryState(RepositoryVersionState.CURRENT);
+ serviceComponentDesiredStateEntity.addVersion(componentVersion);
- component = serviceComponentDesiredStateDAO.merge(component);
+ serviceComponentDesiredStateEntity = serviceComponentDesiredStateDAO.merge(serviceComponentDesiredStateEntity);
map.put(reportedVersion, componentVersion);
@@ -694,35 +694,35 @@ public class ServiceComponentImpl implements ServiceComponent {
}
if (MapUtils.isNotEmpty(map)) {
- String desiredVersion = component.getDesiredVersion();
+ String desiredVersion = serviceComponentDesiredStateEntity.getDesiredVersion();
RepositoryVersionEntity desiredRepositoryVersion = service.getDesiredRepositoryVersion();
List<HostComponentStateEntity> hostComponents = hostComponentDAO.findByServiceAndComponentAndNotVersion(
- component.getServiceName(), component.getComponentName(), reportedVersion);
+ serviceComponentDesiredStateEntity.getServiceName(), serviceComponentDesiredStateEntity.getComponentName(), reportedVersion);
LOG.debug("{}/{} reportedVersion={}, desiredVersion={}, non-matching desired count={}, repo_state={}",
- component.getServiceName(), component.getComponentName(), reportedVersion,
- desiredVersion, hostComponents.size(), component.getRepositoryState());
+ serviceComponentDesiredStateEntity.getServiceName(), serviceComponentDesiredStateEntity.getComponentName(), reportedVersion,
+ desiredVersion, hostComponents.size(), serviceComponentDesiredStateEntity.getRepositoryState());
// !!! if we are unknown, that means it's never been set. Try to determine it.
if (StackVersionListener.UNKNOWN_VERSION.equals(desiredVersion)) {
if (CollectionUtils.isEmpty(hostComponents)) {
// all host components are the same version as reported
- component.setDesiredRepositoryVersion(desiredRepositoryVersion);
- component.setRepositoryState(RepositoryVersionState.CURRENT);
+ serviceComponentDesiredStateEntity.setDesiredRepositoryVersion(desiredRepositoryVersion);
+ serviceComponentDesiredStateEntity.setRepositoryState(RepositoryVersionState.CURRENT);
} else {
// desired is UNKNOWN and there's a mix of versions in the host components
- component.setRepositoryState(RepositoryVersionState.OUT_OF_SYNC);
+ serviceComponentDesiredStateEntity.setRepositoryState(RepositoryVersionState.OUT_OF_SYNC);
}
} else {
if (!reportedVersion.equals(desiredVersion)) {
- component.setRepositoryState(RepositoryVersionState.OUT_OF_SYNC);
+ serviceComponentDesiredStateEntity.setRepositoryState(RepositoryVersionState.OUT_OF_SYNC);
} else if (CollectionUtils.isEmpty(hostComponents)) {
- component.setRepositoryState(RepositoryVersionState.CURRENT);
+ serviceComponentDesiredStateEntity.setRepositoryState(RepositoryVersionState.CURRENT);
}
}
- component = serviceComponentDesiredStateDAO.merge(component);
+ serviceComponentDesiredStateEntity = serviceComponentDesiredStateDAO.merge(serviceComponentDesiredStateEntity);
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
index d9edf1c..539b624 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java
@@ -75,7 +75,7 @@ public class AlertDefinitionHash {
/**
* The hash returned when there are no definitions to hash.
*/
- public static String NULL_MD5_HASH = "37a6259cc0c1dae299a7866489dff0bd";
+ public static final String NULL_MD5_HASH = "37a6259cc0c1dae299a7866489dff0bd";
/**
* DAO for retrieving {@link AlertDefinitionEntity} instances.
@@ -623,12 +623,14 @@ public class AlertDefinitionHash {
// services and components
List<ServiceComponentHost> serviceComponents = cluster.getServiceComponentHosts(hostName);
if (null == serviceComponents || !serviceComponents.isEmpty()) {
- for (ServiceComponentHost serviceComponent : serviceComponents) {
- String serviceName = serviceComponent.getServiceName();
- String componentName = serviceComponent.getServiceComponentName();
+ if (serviceComponents != null) {
+ for (ServiceComponentHost serviceComponent : serviceComponents) {
+ String serviceName = serviceComponent.getServiceName();
+ String componentName = serviceComponent.getServiceComponentName();
- // add all alerts for this service/component pair
- definitions.addAll(m_definitionDao.findByServiceComponent(clusterId, serviceName, componentName));
+ // add all alerts for this service/component pair
+ definitions.addAll(m_definitionDao.findByServiceComponent(clusterId, serviceName, componentName));
+ }
}
// for every service, get the master components and see if the host
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
index cb6fd3b..f1df2cd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/MetricSource.java
@@ -148,7 +148,11 @@ public class MetricSource extends Source {
// !!! even if out of order, this is enough to fail
return list1.equals(list2);
+ }
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(propertyList);
}
public String getUrlSuffix() {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
index 7750f72..f9a4375 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java
@@ -1084,7 +1084,7 @@ public class ClusterImpl implements Cluster {
HostVersionEntity hostVersionEntity = null;
Collection<HostVersionEntity> hostVersions = hostEntity.getHostVersionEntities();
for (HostVersionEntity existingHostVersion : hostVersions) {
- if (existingHostVersion.getRepositoryVersion().getId() == repoVersionEntity.getId()) {
+ if (Objects.equals(existingHostVersion.getRepositoryVersion().getId(), repoVersionEntity.getId())) {
hostVersionEntity = existingHostVersion;
break;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
index 9937db7..b9db130 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/host/HostImpl.java
@@ -912,7 +912,8 @@ public class HostImpl implements Host {
@Override
public long getTimeInState() {
HostStateEntity hostStateEntity = getHostStateEntity();
- return hostStateEntity != null ? hostStateEntity.getTimeInState() : null;
+ Long timeInState = hostStateEntity != null ? hostStateEntity.getTimeInState() : null;
+ return timeInState != null ? timeInState : 0L;
}
@Override
@@ -932,7 +933,7 @@ public class HostImpl implements Host {
@Override
public void setStatus(String status) {
- if (this.status != status) {
+ if (!Objects.equals(this.status, status)) {
ambariEventPublisher.publish(new HostStatusUpdateEvent(getHostName(), status));
}
this.status = status;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
index be87002..85e9e4e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java
@@ -82,7 +82,7 @@ public class VersionDefinitionXml {
private static final Logger LOG = LoggerFactory.getLogger(VersionDefinitionXml.class);
- public static String SCHEMA_LOCATION = "version_definition.xsd";
+ public static final String SCHEMA_LOCATION = "version_definition.xsd";
/**
* Release details.
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
index 90d562f..1743861 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/LatestRepoCallable.java
@@ -107,7 +107,7 @@ public class LatestRepoCallable implements Callable<Void> {
}
StackId stackId = new StackId(stack);
- if (!latestUrlMap.containsKey(stackId.toString())) {
+ if (latestUrlMap == null || !latestUrlMap.containsKey(stackId.toString())) {
return null;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
index 6e95c4d..d1ee1fb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/AmbariContext.java
@@ -571,7 +571,7 @@ public class AmbariContext {
for (String actualConfigType : updatedConfigTypes) {
// get the actual cluster config for comparison
DesiredConfig actualConfig = cluster.getDesiredConfigs().get(actualConfigType);
- if (actualConfig == null && actualConfigType.equals("core-site")) {
+ if (actualConfig == null || actualConfigType.equals("core-site")) {
continue;
}
if (!actualConfig.getTag().equals(TopologyManager.TOPOLOGY_RESOLVED_TAG)) {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java
index 569acae..33c80e4 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/BlueprintValidatorImpl.java
@@ -138,8 +138,6 @@ public class BlueprintValidatorImpl implements BlueprintValidator {
for (HostGroup hostGroup : blueprint.getHostGroups().values()) {
- Collection<String> processedServices = new HashSet<>();
- Map<String, Collection<String>> allRequiredProperties = new HashMap<>();
Map<String, Map<String, String>> operationalConfiguration = new HashMap<>(clusterConfigurations);
operationalConfiguration.putAll(hostGroup.getConfiguration().getProperties());
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/Cardinality.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/Cardinality.java
index 2352e5d..ef45480 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/Cardinality.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/Cardinality.java
@@ -32,7 +32,7 @@ public class Cardinality {
this.cardinality = cardinality;
if (cardinality != null && ! cardinality.isEmpty()) {
if (cardinality.contains("+")) {
- min = Integer.valueOf(cardinality.split("\\+")[0]);
+ min = Integer.parseInt(cardinality.split("\\+")[0]);
} else if (cardinality.contains("-")) {
String[] toks = cardinality.split("-");
min = Integer.parseInt(toks[0]);
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
index 7ca1c1d..004455d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/topology/TopologyManager.java
@@ -27,6 +27,7 @@ import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
@@ -695,7 +696,7 @@ public class TopologyManager {
if (!matchedToRequest) {
boolean addToAvailableList = true;
for (HostImpl registered : availableHosts) {
- if (registered.getHostId() == host.getHostId()) {
+ if (Objects.equals(registered.getHostId(), host.getHostId())) {
LOG.info("Host {} re-registered, will not be added to the available hosts list", hostName);
addToAvailableList = false;
break;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
index f6270be..27b994e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog270.java
@@ -242,15 +242,7 @@ public class UpgradeCatalog270 extends AbstractUpgradeCatalog {
protected static final String WIDGET_TABLE = "widget";
protected static final String WIDGET_TAG_COLUMN = "tag";
- protected static final String CLUSTER_ID_COLUMN = "cluster_id";
- public static final String[] COMPONENT_NAME_SERVICE_NAME_CLUSTER_ID_KEY_COLUMNS = {COMPONENT_NAME_COLUMN, SERVICE_NAME_COLUMN, CLUSTER_ID_COLUMN};
- public static final String[] SERVICE_NAME_CLUSTER_ID_KEY_COLUMNS = {SERVICE_NAME_COLUMN, CLUSTER_ID_COLUMN};
protected static final String SERVICE_COMPONENT_DESIRED_STATE_TABLE = "servicecomponentdesiredstate";
- protected static final String CLUSTER_SERVICES_TABLE = "clusterservices";
- protected static final String SERVICE_COMPONENT_DESIRED_STATES_CLUSTER_SERVICES_FK = "srvccmponentdesiredstatesrvcnm";
- protected static final String SERVICE_DESIRED_STATE_CLUSTER_SERVICES_FK = "servicedesiredstateservicename";
- protected static final String COMPONENT_DESIRED_STATE_SERVICE_COMPONENT_DESIRED_STATE_FK = "hstcmpnntdesiredstatecmpnntnme";
- protected static final String COMPONENT_STATE_SERVICE_COMPONENT_DESIRED_STATE_FK = "hstcomponentstatecomponentname";
protected static final String HIVE_SERVICE_COMPONENT_WEBHCAT_SERVER = "WEBHCAT_SERVER";
protected static final String CONFIGURATION_CORE_SITE = "core-site";
protected static final String CONFIGURATION_WEBHCAT_SITE = "webhcat-site";
@@ -1782,10 +1774,9 @@ public class UpgradeCatalog270 extends AbstractUpgradeCatalog {
return;
Map<String, Cluster> clusterMap = clusters.getClusters();
-
- ConfigHelper configHelper = injector.getInstance(ConfigHelper.class);
- if (clusterMap == null || clusterMap.isEmpty())
+ if (clusterMap == null || clusterMap.isEmpty()) {
return;
+ }
for (final Cluster cluster : clusterMap.values()) {
updateConfig(cluster, "logsearch-service_logs-solrconfig", (content) -> {
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/JsonUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/JsonUtils.java
index 8d5e307..b0de66b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/JsonUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/JsonUtils.java
@@ -27,7 +27,7 @@ import com.google.gson.JsonSyntaxException;
*/
public class JsonUtils {
- public static JsonParser jsonParser = new JsonParser();
+ public static final JsonParser jsonParser = new JsonParser();
/**
* Checks if an input string is in valid JSON format
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
index ce0d495..9dd7ea1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/utils/StageUtils.java
@@ -365,41 +365,23 @@ public class StageUtils {
for (String hostComponent : hostComponents) {
String roleName = getClusterHostInfoKey(hostComponent);
- if (null == roleName) {
- roleName = additionalComponentToClusterInfoKeyMap.get(hostComponent);
- }
- if (null == roleName) {
- // even though all mappings are being added, componentToClusterInfoKeyMap is
- // a higher priority lookup
- for (Service service : cluster.getServices().values()) {
- for (ServiceComponent sc : service.getServiceComponents().values()) {
- if (sc.getName().equals(hostComponent)) {
- roleName = hostComponent.toLowerCase() + "_hosts";
- additionalComponentToClusterInfoKeyMap.put(hostComponent, roleName);
- }
- }
- }
- }
-
- if (roleName != null) {
- SortedSet<Integer> hostsForComponentsHost = hostRolesInfo.get(roleName);
+ SortedSet<Integer> hostsForComponentsHost = hostRolesInfo.get(roleName);
- if (hostsForComponentsHost == null) {
- hostsForComponentsHost = new TreeSet<>();
- hostRolesInfo.put(roleName, hostsForComponentsHost);
- }
+ if (hostsForComponentsHost == null) {
+ hostsForComponentsHost = new TreeSet<>();
+ hostRolesInfo.put(roleName, hostsForComponentsHost);
+ }
- int hostIndex = hostsList.indexOf(hostname);
- if (hostIndex != -1) {
- if (!hostsForComponentsHost.contains(hostIndex)) {
- hostsForComponentsHost.add(hostIndex);
- }
- } else {
- //todo: I don't think that this can happen
- //todo: determine if it can and if so, handle properly
- //todo: if it 'cant' should probably enforce invariant
- throw new RuntimeException("Unable to get host index for host: " + hostname);
+ int hostIndex = hostsList.indexOf(hostname);
+ if (hostIndex != -1) {
+ if (!hostsForComponentsHost.contains(hostIndex)) {
+ hostsForComponentsHost.add(hostIndex);
}
+ } else {
+ //todo: I don't think that this can happen
+ //todo: determine if it can and if so, handle properly
+ //todo: if it 'cant' should probably enforce invariant
+ throw new RuntimeException("Unable to get host index for host: " + hostname);
}
}
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java
index 91ee03d..fbc064b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/configuration/ViewConfig.java
@@ -347,7 +347,7 @@ public class ViewConfig {
* @return the data version
*/
public int getDataVersion() {
- return (dataVersion == null) ? 0 : Integer.valueOf(dataVersion);
+ return (dataVersion == null) ? 0 : Integer.parseInt(dataVersion);
}
/**
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
index d70a38a..e83024a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/AmbariManagementControllerTest.java
@@ -5651,7 +5651,7 @@ public class AmbariManagementControllerTest {
clusters.getHost(host3).setState(HostState.WAITING_FOR_HOST_STATUS_UPDATES);
clusters.getHost(host2).setState(HostState.INIT);
try {
- response = controller.createAction(actionRequest, requestProperties);
+ controller.createAction(actionRequest, requestProperties);
assertTrue("Exception should have been raised.", false);
} catch (Exception e) {
assertTrue(e.getMessage().contains("there were no healthy eligible hosts"));
@@ -6003,8 +6003,7 @@ public class AmbariManagementControllerTest {
scHost = s.getServiceComponent("DATANODE").getServiceComponentHost(host2);
Assert.assertEquals(HostComponentAdminState.INSERVICE, scHost.getComponentAdminState());
Assert.assertEquals(MaintenanceState.OFF, scHost.getMaintenanceState());
- execCmd = storedTasks.get(0).getExecutionCommandWrapper
- ().getExecutionCommand();
+ execCmd = storedTasks.get(0).getExecutionCommandWrapper().getExecutionCommand();
Assert.assertNotNull(storedTasks);
Assert.assertEquals(2, storedTasks.size());
int countRefresh = 0;
@@ -6102,7 +6101,7 @@ public class AmbariManagementControllerTest {
ExecuteActionRequest actionRequest = new ExecuteActionRequest(cluster1, null, action1, resourceFilters, null, params, false);
RequestStatusResponse response = null;
try {
- response = controller.createAction(actionRequest, requestProperties);
+ controller.createAction(actionRequest, requestProperties);
} catch (Exception ae) {
LOG.info("Expected exception.", ae);
Assert.assertTrue(ae.getMessage().contains("Custom action definition only " +
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
index 49cd8e1..44ccd3d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestImplTest.java
@@ -197,6 +197,8 @@ public class RequestImplTest {
request = PropertyHelper.getReadRequest(PropertyHelper.getPropertyIds(Resource.Type.User));
validPropertyIds = request.getPropertyIds();
+ Assert.assertFalse(validPropertyIds.contains("Users/unsupported_property_id"));
+ Assert.assertTrue(validPropertyIds.contains("Users/user_name"));
request = PropertyHelper.getReadRequest(PropertyHelper.getPropertyIds(Resource.Type.Stack));
validPropertyIds = request.getPropertyIds();
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
index e375c93..d256dec 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/metrics/JMXPropertyProviderTest.java
@@ -270,10 +270,6 @@ public class JMXPropertyProviderTest {
Assert.assertEquals(136314880, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax")));
Assert.assertEquals(21933376, resource.getPropertyValue(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryUsed")));
-
- // only ask for specific properties
- Set<String> properties = new HashSet<>();
-
// hbase master
resource = new ResourceImpl(Resource.Type.HostComponent);
resource.setProperty(CLUSTER_NAME_PROPERTY_ID, "c1");
@@ -282,7 +278,7 @@ public class JMXPropertyProviderTest {
resource.setProperty(HOST_COMPONENT_STATE_PROPERTY_ID, "STARTED");
// only ask for specific properties
- properties = new HashSet<>();
+ Set<String> properties = new HashSet<>();
properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryMax"));
properties.add(PropertyHelper.getPropertyId("metrics/jvm", "HeapMemoryUsed"));
properties.add(PropertyHelper.getPropertyId("metrics/jvm", "NonHeapMemoryMax"));
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
index fbc2a76..fd1f053 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java
@@ -453,8 +453,7 @@ public class OrmTestHelper {
String serviceName = "HDFS";
Service service = serviceFactory.createNew(cluster, serviceName, repositoryVersion);
- service = cluster.getService(serviceName);
- assertNotNull(service);
+ assertNotNull(cluster.getService(serviceName));
ServiceComponent datanode = componentFactory.createNew(service, "DATANODE");
@@ -487,8 +486,7 @@ public class OrmTestHelper {
String serviceName = "YARN";
Service service = serviceFactory.createNew(cluster, serviceName, repositoryVersion);
- service = cluster.getService(serviceName);
- assertNotNull(service);
+ assertNotNull(cluster.getService(serviceName));
ServiceComponent resourceManager = componentFactory.createNew(service,
"RESOURCEMANAGER");
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java
index 933743f..49f5679 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/AlertsDAOTest.java
@@ -1250,10 +1250,6 @@ public class AlertsDAOTest {
AlertHistoryResourceProvider.ALERT_HISTORY_CLUSTER_NAME).equals("c1").and().property(
AlertHistoryResourceProvider.ALERT_HISTORY_SERVICE_NAME).equals("HDFS").toPredicate();
- clusterAndHdfsPredicate = new PredicateBuilder().property(
- AlertHistoryResourceProvider.ALERT_HISTORY_CLUSTER_NAME).equals("c1").and().property(
- AlertHistoryResourceProvider.ALERT_HISTORY_SERVICE_NAME).equals("HDFS").toPredicate();
-
clusterAndHdfsAndCriticalPredicate = new PredicateBuilder().property(
AlertHistoryResourceProvider.ALERT_HISTORY_CLUSTER_NAME).equals("c1").and().property(
AlertHistoryResourceProvider.ALERT_HISTORY_SERVICE_NAME).equals("HDFS").and().property(
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java
index 6c8514e..35b82c6 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java
@@ -38,7 +38,6 @@ import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
import org.apache.ambari.server.state.AlertState;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceFactory;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.state.alert.AggregateDefinitionMapping;
@@ -313,9 +312,7 @@ public class AlertEventPublisherTest {
cluster.getCurrentStackVersion(), REPO_VERSION);
String serviceName = "HDFS";
- Service service = serviceFactory.createNew(cluster, serviceName, repositoryVersion);
- service = cluster.getService(serviceName);
-
- Assert.assertNotNull(service);
+ serviceFactory.createNew(cluster, serviceName, repositoryVersion);
+ Assert.assertNotNull(cluster.getService(serviceName));
}
}
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java
index 88db216..5bbc881 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java
@@ -39,7 +39,6 @@ import org.apache.ambari.server.state.AlertFirmness;
import org.apache.ambari.server.state.AlertState;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceFactory;
import org.apache.ambari.server.state.StackId;
import org.apache.ambari.server.utils.EventBusSynchronizer;
@@ -187,10 +186,8 @@ public class InitialAlertEventTest {
private void installHdfsService() throws Exception {
String serviceName = "HDFS";
- Service service = m_serviceFactory.createNew(m_cluster, serviceName, m_repositoryVersion);
- service = m_cluster.getService(serviceName);
-
- Assert.assertNotNull(service);
+ m_serviceFactory.createNew(m_cluster, serviceName, m_repositoryVersion);
+ Assert.assertNotNull(m_cluster.getService(serviceName));
}
/**
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
index ad8b84a..da75ed2 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java
@@ -2222,7 +2222,6 @@ public class ClusterTest {
// check desired config
Map<String, DesiredConfig> desiredConfigs = cluster.getDesiredConfigs();
DesiredConfig desiredConfig = desiredConfigs.get(configType);
- desiredConfig = desiredConfigs.get(configType);
assertNotNull(desiredConfig);
assertEquals(Long.valueOf(2), desiredConfig.getVersion());
assertEquals("version-2", desiredConfig.getTag());