AMBARI-19149. Code cleanup: redundant type arguments
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/edbb5492 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/edbb5492 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/edbb5492 Branch: refs/heads/branch-feature-AMBARI-12556 Commit: edbb549206a0a48b9e6619fa702fd7f5a8d451aa Parents: ec1505f Author: Attila Doroszlai <adorosz...@hortonworks.com> Authored: Wed Mar 29 12:57:55 2017 +0200 Committer: Attila Doroszlai <adorosz...@hortonworks.com> Committed: Wed Mar 29 14:42:14 2017 +0200 ---------------------------------------------------------------------- .../server/KdcServerConnectionVerification.java | 31 +- .../java/org/apache/ambari/server/Role.java | 2 +- .../actionmanager/ActionDBAccessorImpl.java | 14 +- .../server/actionmanager/ActionManager.java | 2 +- .../server/actionmanager/ActionScheduler.java | 30 +- .../ambari/server/actionmanager/Request.java | 10 +- .../ambari/server/actionmanager/Stage.java | 22 +- .../apache/ambari/server/agent/ActionQueue.java | 12 +- .../ambari/server/agent/AgentRequests.java | 2 +- .../ambari/server/agent/ExecutionCommand.java | 10 +- .../apache/ambari/server/agent/HeartBeat.java | 6 +- .../ambari/server/agent/HeartBeatHandler.java | 14 +- .../ambari/server/agent/HeartBeatResponse.java | 10 +- .../ambari/server/agent/HeartbeatMonitor.java | 6 +- .../ambari/server/agent/HeartbeatProcessor.java | 2 +- .../apache/ambari/server/agent/HostInfo.java | 2 +- .../ambari/server/agent/RecoveryReport.java | 2 +- .../server/agent/RegistrationResponse.java | 2 +- .../ambari/server/agent/StatusCommand.java | 4 +- .../alerts/AmbariPerformanceRunnable.java | 2 +- .../server/alerts/StaleAlertRunnable.java | 2 +- .../server/api/AmbariCsrfProtectionFilter.java | 2 +- .../ambari/server/api/AmbariErrorHandler.java | 2 +- .../server/api/handlers/QueryCreateHandler.java | 6 +- .../ambari/server/api/predicate/QueryLexer.java | 24 +- .../server/api/predicate/QueryParser.java | 8 +- .../expressions/AbstractExpression.java | 2 +- .../expressions/NotLogicalExpression.java | 2 +- .../api/predicate/operators/EqualsOperator.java | 2 +- .../operators/GreaterEqualsOperator.java | 2 +- .../predicate/operators/GreaterOperator.java | 2 +- .../api/predicate/operators/InOperator.java | 2 +- .../predicate/operators/LessEqualsOperator.java | 2 +- .../api/predicate/operators/LessOperator.java | 2 +- .../predicate/operators/NotEqualsOperator.java | 2 +- .../query/ExtendedResourcePredicateVisitor.java | 2 +- .../server/api/query/JpaPredicateVisitor.java | 4 +- .../ambari/server/api/query/JpaSortBuilder.java | 2 +- .../api/query/ProcessingPredicateVisitor.java | 6 +- .../ambari/server/api/query/QueryImpl.java | 60 +- .../ambari/server/api/query/QueryInfo.java | 2 +- .../api/query/SubResourcePredicateVisitor.java | 2 +- .../render/AlertSummaryGroupedRenderer.java | 6 +- .../api/query/render/AlertSummaryRenderer.java | 4 +- .../server/api/query/render/BaseRenderer.java | 2 +- .../query/render/ClusterBlueprintRenderer.java | 36 +- .../api/query/render/DefaultRenderer.java | 4 +- .../api/query/render/MinimalRenderer.java | 10 +- .../api/resources/BaseResourceDefinition.java | 8 +- .../resources/ClusterResourceDefinition.java | 2 +- ...ComponentStackVersionResourceDefinition.java | 2 +- .../ExtensionLinkResourceDefinition.java | 2 +- .../resources/ExtensionResourceDefinition.java | 2 +- .../ExtensionVersionResourceDefinition.java | 2 +- .../api/resources/FeedResourceDefinition.java | 2 +- .../api/resources/GroupResourceDefinition.java | 2 +- .../HostComponentResourceDefinition.java | 4 +- .../api/resources/JobResourceDefinition.java | 2 +- .../resources/PermissionResourceDefinition.java | 2 +- .../resources/ResourceInstanceFactoryImpl.java | 2 +- ...tServiceHostComponentResourceDefinition.java | 2 +- .../RootServiceResourceDefinition.java | 2 +- .../resources/ServiceResourceDefinition.java | 2 +- .../StackConfigurationResourceDefinition.java | 2 +- ...ackLevelConfigurationResourceDefinition.java | 2 +- .../api/resources/StackResourceDefinition.java | 2 +- .../StackServiceResourceDefinition.java | 2 +- .../StackVersionResourceDefinition.java | 2 +- .../api/resources/UserResourceDefinition.java | 2 +- .../ViewInstanceResourceDefinition.java | 2 +- .../ViewVersionResourceDefinition.java | 2 +- .../resources/WorkflowResourceDefinition.java | 2 +- .../server/api/rest/BootStrapResource.java | 4 +- .../api/services/ActiveWidgetLayoutService.java | 2 +- .../api/services/AlertDefinitionService.java | 2 +- .../server/api/services/AlertGroupService.java | 2 +- .../api/services/AlertHistoryService.java | 2 +- .../server/api/services/AlertNoticeService.java | 2 +- .../server/api/services/AlertService.java | 2 +- .../server/api/services/AlertTargetService.java | 2 +- .../server/api/services/AmbariMetaInfo.java | 40 +- .../ambari/server/api/services/BaseRequest.java | 6 +- .../ClusterKerberosDescriptorService.java | 2 +- .../api/services/ClusterPrivilegeService.java | 2 +- .../server/api/services/ClusterService.java | 2 +- .../services/ClusterStackVersionService.java | 4 +- .../CompatibleRepositoryVersionService.java | 4 +- .../server/api/services/ComponentService.java | 4 +- .../server/api/services/ConfigGroupService.java | 2 +- .../api/services/ConfigurationService.java | 2 +- .../server/api/services/CredentialService.java | 2 +- .../api/services/ExtensionLinksService.java | 2 +- .../server/api/services/ExtensionsService.java | 4 +- .../api/services/GroupPrivilegeService.java | 2 +- .../api/services/HostComponentService.java | 6 +- .../services/HostKerberosIdentityService.java | 2 +- .../ambari/server/api/services/HostService.java | 2 +- .../api/services/HostStackVersionService.java | 4 +- .../server/api/services/InstanceService.java | 2 +- .../ambari/server/api/services/JobService.java | 2 +- .../server/api/services/LoggingService.java | 2 +- .../server/api/services/MemberService.java | 2 +- .../api/services/OperatingSystemService.java | 4 +- .../api/services/PersistKeyValueImpl.java | 4 +- .../api/services/PersistKeyValueService.java | 2 +- .../api/services/RecommendationService.java | 2 +- .../server/api/services/RepositoryService.java | 2 +- .../api/services/RepositoryVersionService.java | 4 +- .../ambari/server/api/services/RequestBody.java | 6 +- .../server/api/services/RequestFactory.java | 2 +- .../api/services/RequestScheduleService.java | 2 +- .../server/api/services/RequestService.java | 2 +- .../ambari/server/api/services/ResultImpl.java | 2 +- .../api/services/ResultPostProcessorImpl.java | 4 +- .../api/services/RoleAuthorizationService.java | 2 +- .../server/api/services/RootServiceService.java | 6 +- .../services/ServiceConfigVersionService.java | 2 +- .../server/api/services/ServiceService.java | 4 +- .../server/api/services/StacksService.java | 30 +- .../server/api/services/StageService.java | 2 +- .../server/api/services/TaskAttemptService.java | 2 +- .../ambari/server/api/services/TaskService.java | 2 +- .../api/services/UpgradeGroupService.java | 2 +- .../server/api/services/UpgradeItemService.java | 2 +- .../server/api/services/UpgradeService.java | 2 +- .../api/services/UpgradeSummaryService.java | 2 +- .../api/services/UserAuthorizationService.java | 2 +- .../api/services/UserPrivilegeService.java | 2 +- .../server/api/services/ValidationService.java | 2 +- .../api/services/VersionDefinitionService.java | 2 +- .../ViewExternalSubResourceService.java | 4 +- .../api/services/ViewInstanceService.java | 2 +- .../api/services/ViewPermissionService.java | 2 +- .../api/services/ViewPrivilegeService.java | 2 +- .../api/services/ViewSubResourceService.java | 2 +- .../server/api/services/ViewVersionService.java | 2 +- .../api/services/WidgetLayoutService.java | 2 +- .../server/api/services/WidgetService.java | 2 +- .../server/api/services/WorkflowService.java | 2 +- .../services/parsers/JsonRequestBodyParser.java | 10 +- .../api/services/serializers/CsvSerializer.java | 6 +- .../StackAdvisorBlueprintProcessor.java | 8 +- .../stackadvisor/StackAdvisorRequest.java | 16 +- .../stackadvisor/StackAdvisorRunner.java | 2 +- ...rationDependenciesRecommendationCommand.java | 12 +- .../ConfigurationRecommendationCommand.java | 12 +- .../commands/StackAdvisorCommand.java | 6 +- .../recommendations/RecommendationResponse.java | 6 +- .../ambari/server/api/util/TreeNodeImpl.java | 6 +- ...ClusterPrivilegeChangeRequestAuditEvent.java | 4 +- .../ViewPrivilegeChangeRequestAuditEvent.java | 4 +- .../eventcreator/PrivilegeEventCreator.java | 2 +- .../RepositoryVersionEventCreator.java | 4 +- .../RequestAuditEventCreatorHelper.java | 2 +- .../eventcreator/ViewPrivilegeEventCreator.java | 2 +- .../server/bootstrap/BSHostStatusCollector.java | 2 +- .../ambari/server/bootstrap/BSRunner.java | 2 +- .../ambari/server/bootstrap/BootStrapImpl.java | 4 +- .../ambari/server/bootstrap/SshHostInfo.java | 2 +- .../server/checks/AbstractCheckDescriptor.java | 2 +- .../server/checks/ClientRetryPropertyCheck.java | 2 +- .../checks/ComponentsInstallationCheck.java | 6 +- .../server/checks/ConfigurationMergeCheck.java | 2 +- .../ambari/server/checks/HealthCheck.java | 2 +- .../HiveDynamicServiceDiscoveryCheck.java | 2 +- .../checks/HostsMasterMaintenanceCheck.java | 4 +- .../server/checks/InstallPackagesCheck.java | 6 +- ...apReduce2JobHistoryStatePreservingCheck.java | 2 +- .../server/checks/PreviousUpgradeCompleted.java | 2 +- .../checks/SecondaryNamenodeDeletedCheck.java | 2 +- .../server/checks/ServicePresenceCheck.java | 4 +- .../ServicesMapReduceDistributedCacheCheck.java | 2 +- .../ServicesTezDistributedCacheCheck.java | 2 +- .../ambari/server/checks/ServicesUpCheck.java | 6 +- .../server/checks/UpgradeCheckRegistry.java | 12 +- .../server/checks/VersionMismatchCheck.java | 2 +- .../collections/functors/ContainsPredicate.java | 2 +- .../DelegatedMultiplePredicateContainer.java | 2 +- .../collections/functors/EqualsPredicate.java | 2 +- .../functors/PredicateClassFactory.java | 2 +- .../server/controller/AmbariHandlerList.java | 4 +- .../server/controller/AuthToLocalBuilder.java | 8 +- .../server/controller/ConfigurationRequest.java | 4 +- .../server/controller/ExecuteActionRequest.java | 4 +- .../controller/ExtensionLinkResponse.java | 2 +- .../controller/ExtensionVersionResponse.java | 2 +- .../server/controller/KerberosHelperImpl.java | 118 +- .../server/controller/LdapSyncRequest.java | 2 +- .../controller/MaintenanceStateHelper.java | 6 +- .../server/controller/PrereqCheckRequest.java | 2 +- .../controller/RequestsByStatusesRequest.java | 2 +- .../controller/RootServiceResponseFactory.java | 8 +- .../StackServiceComponentResponse.java | 2 +- .../server/controller/StackServiceResponse.java | 2 +- .../server/controller/StackVersionResponse.java | 2 +- .../gsinstaller/ClusterDefinition.java | 26 +- .../gsinstaller/GSInstallerNoOpProvider.java | 2 +- .../gsinstaller/GSInstallerProviderModule.java | 2 +- .../GSInstallerResourceProvider.java | 12 +- .../AbstractAuthorizedResourceProvider.java | 2 +- .../internal/AbstractPropertyProvider.java | 10 +- .../internal/AbstractProviderModule.java | 70 +- .../internal/AbstractResourceProvider.java | 16 +- .../internal/ActionResourceProvider.java | 10 +- .../ActiveWidgetLayoutResourceProvider.java | 14 +- .../AlertDefinitionResourceProvider.java | 16 +- .../internal/AlertGroupResourceProvider.java | 34 +- .../internal/AlertHistoryResourceProvider.java | 10 +- .../internal/AlertNoticeResourceProvider.java | 10 +- .../internal/AlertResourceProvider.java | 10 +- .../internal/AlertSummaryPropertyProvider.java | 14 +- .../internal/AlertTargetResourceProvider.java | 34 +- .../AmbariPrivilegeResourceProvider.java | 6 +- .../controller/internal/AppCookieManager.java | 2 +- .../internal/ArtifactResourceProvider.java | 26 +- .../controller/internal/BaseClusterRequest.java | 4 +- .../controller/internal/BaseProvider.java | 22 +- .../BlueprintConfigurationProcessor.java | 176 +- .../internal/BlueprintResourceProvider.java | 28 +- .../controller/internal/CalculatedStatus.java | 18 +- .../internal/ClientConfigResourceProvider.java | 45 +- .../internal/ClusterControllerImpl.java | 22 +- ...usterKerberosDescriptorResourceProvider.java | 8 +- .../ClusterPrivilegeResourceProvider.java | 6 +- .../internal/ClusterResourceProvider.java | 16 +- .../ClusterStackVersionResourceProvider.java | 26 +- ...atibleRepositoryVersionResourceProvider.java | 2 +- .../internal/ConfigGroupResourceProvider.java | 34 +- .../internal/ConfigurationResourceProvider.java | 22 +- .../internal/CredentialResourceProvider.java | 10 +- .../internal/ExportBlueprintRequest.java | 30 +- .../server/controller/internal/Extension.java | 20 +- .../internal/ExtensionLinkResourceProvider.java | 14 +- .../internal/ExtensionResourceProvider.java | 8 +- .../ExtensionVersionResourceProvider.java | 8 +- .../internal/FeedResourceProvider.java | 10 +- .../GroupPrivilegeResourceProvider.java | 6 +- .../internal/GroupResourceProvider.java | 14 +- .../HostComponentProcessResourceProvider.java | 8 +- .../internal/HostComponentResourceProvider.java | 50 +- .../HostKerberosIdentityResourceProvider.java | 4 +- .../internal/HostResourceProvider.java | 32 +- .../internal/InstanceResourceProvider.java | 10 +- .../internal/JobResourceProvider.java | 14 +- .../KerberosDescriptorResourceProvider.java | 2 +- .../internal/LdapSyncEventResourceProvider.java | 28 +- .../internal/LoggingResourceProvider.java | 6 +- .../internal/MemberResourceProvider.java | 18 +- .../OperatingSystemResourceProvider.java | 4 +- .../internal/PermissionResourceProvider.java | 8 +- .../PreUpgradeCheckResourceProvider.java | 2 +- .../internal/PrivilegeResourceProvider.java | 22 +- .../internal/PropertyPredicateVisitor.java | 2 +- .../QuickLinkArtifactResourceProvider.java | 16 +- .../RecommendationResourceProvider.java | 14 +- .../internal/RemoteClusterResourceProvider.java | 10 +- .../internal/RepositoryResourceProvider.java | 8 +- .../RepositoryVersionResourceProvider.java | 12 +- .../internal/RequestResourceFilter.java | 2 +- .../internal/RequestResourceProvider.java | 28 +- .../RequestScheduleResourceProvider.java | 22 +- .../internal/RequestStageContainer.java | 2 +- .../RoleAuthorizationResourceProvider.java | 8 +- .../RootServiceComponentPropertyProvider.java | 4 +- .../RootServiceComponentResourceProvider.java | 8 +- ...ootServiceHostComponentResourceProvider.java | 10 +- .../internal/RootServiceResourceProvider.java | 8 +- .../ServiceConfigVersionResourceProvider.java | 24 +- .../internal/ServiceResourceProvider.java | 42 +- .../internal/SimplifyingPredicateVisitor.java | 6 +- .../controller/internal/SortRequestImpl.java | 2 +- .../server/controller/internal/Stack.java | 76 +- .../internal/StackAdvisorResourceProvider.java | 22 +- .../internal/StackArtifactResourceProvider.java | 18 +- ...ConfigurationDependencyResourceProvider.java | 12 +- .../StackConfigurationResourceProvider.java | 10 +- .../internal/StackDefinedPropertyProvider.java | 10 +- .../StackDependencyResourceProvider.java | 10 +- ...StackLevelConfigurationResourceProvider.java | 10 +- .../internal/StackResourceProvider.java | 8 +- .../StackServiceComponentResourceProvider.java | 12 +- .../internal/StackServiceResourceProvider.java | 10 +- .../internal/StackVersionResourceProvider.java | 8 +- .../internal/StageResourceProvider.java | 10 +- .../internal/TargetClusterResourceProvider.java | 12 +- .../internal/TaskAttemptResourceProvider.java | 16 +- .../internal/TaskResourceProvider.java | 8 +- .../internal/ThemeArtifactResourceProvider.java | 16 +- .../controller/internal/URLStreamProvider.java | 2 +- .../internal/UpgradeGroupResourceProvider.java | 12 +- .../internal/UpgradeItemResourceProvider.java | 18 +- .../UpgradeSummaryResourceProvider.java | 14 +- .../UserAuthorizationResourceProvider.java | 10 +- .../internal/UserPrivilegeResourceProvider.java | 6 +- .../internal/UserResourceProvider.java | 14 +- .../internal/ValidationResourceProvider.java | 10 +- .../VersionDefinitionResourceProvider.java | 2 +- .../internal/ViewInstanceResourceProvider.java | 14 +- .../ViewPermissionResourceProvider.java | 8 +- .../internal/ViewPrivilegeResourceProvider.java | 8 +- .../internal/ViewResourceProvider.java | 8 +- .../internal/ViewURLResourceProvider.java | 6 +- .../internal/ViewVersionResourceProvider.java | 8 +- .../internal/WidgetLayoutResourceProvider.java | 18 +- .../internal/WidgetResourceProvider.java | 12 +- .../internal/WorkflowResourceProvider.java | 14 +- .../controller/jdbc/JDBCResourceProvider.java | 10 +- .../controller/jmx/JMXPropertyProvider.java | 8 +- .../controller/logging/LogLineResult.java | 2 +- .../logging/LoggingRequestHelperImpl.java | 4 +- .../logging/LoggingSearchPropertyProvider.java | 2 +- .../MetricsDataTransferMethodFactory.java | 4 +- .../MetricsDownsamplingMethodFactory.java | 2 +- .../metrics/RestMetricsPropertyProvider.java | 10 +- .../ThreadPoolEnabledPropertyProvider.java | 4 +- .../GangliaComponentPropertyProvider.java | 6 +- .../GangliaHostComponentPropertyProvider.java | 6 +- .../ganglia/GangliaHostPropertyProvider.java | 2 +- .../metrics/ganglia/GangliaMetric.java | 2 +- .../ganglia/GangliaPropertyProvider.java | 24 +- .../ganglia/GangliaReportPropertyProvider.java | 6 +- .../metrics/timeline/AMSPropertyProvider.java | 26 +- .../timeline/AMSReportPropertyProvider.java | 8 +- .../cache/TimelineMetricCacheEntryFactory.java | 4 +- .../controller/predicate/AndPredicate.java | 2 +- .../controller/predicate/ArrayPredicate.java | 8 +- .../controller/predicate/EqualsPredicate.java | 2 +- .../predicate/GreaterEqualsPredicate.java | 2 +- .../controller/predicate/GreaterPredicate.java | 2 +- .../predicate/LessEqualsPredicate.java | 2 +- .../controller/predicate/LessPredicate.java | 2 +- .../controller/predicate/OrPredicate.java | 2 +- .../ambari/server/controller/spi/Resource.java | 2 +- ...eredThreadPoolExecutorCompletionService.java | 2 +- .../controller/utilities/PredicateBuilder.java | 12 +- .../controller/utilities/PropertyHelper.java | 26 +- .../customactions/ActionDefinitionManager.java | 8 +- .../customactions/ActionDefinitionXml.java | 2 +- .../alerts/AlertAggregateListener.java | 2 +- .../listeners/alerts/AlertHostListener.java | 2 +- .../alerts/AlertStateChangedListener.java | 2 +- .../listeners/tasks/TaskStatusListener.java | 2 +- .../upgrade/HostVersionOutOfSyncListener.java | 4 +- .../ambari/server/metadata/ActionMetadata.java | 10 +- .../metadata/AmbariServiceAlertDefinitions.java | 2 +- .../server/metadata/RoleCommandOrder.java | 8 +- .../system/impl/AmbariMetricSinkImpl.java | 2 +- .../system/impl/AmbariPerformanceMonitor.java | 2 +- .../server/notifications/DispatchFactory.java | 2 +- .../dispatchers/SNMPDispatcher.java | 2 +- .../orm/AmbariJpaLocalTxnInterceptor.java | 2 +- .../orm/AmbariLocalSessionInterceptor.java | 2 +- .../apache/ambari/server/orm/dao/AlertsDAO.java | 6 +- .../orm/dao/ConfigGroupHostMappingDAO.java | 14 +- .../ambari/server/orm/dao/ExtensionLinkDAO.java | 4 +- .../apache/ambari/server/orm/dao/GroupDAO.java | 2 +- .../server/orm/dao/HostConfigMappingDAO.java | 22 +- .../apache/ambari/server/orm/dao/HostDAO.java | 2 +- .../server/orm/dao/HostRoleCommandDAO.java | 16 +- .../dao/HostRoleCommandStatusSummaryDTO.java | 4 +- .../apache/ambari/server/orm/dao/MemberDAO.java | 2 +- .../ambari/server/orm/dao/ServiceConfigDAO.java | 2 +- .../apache/ambari/server/orm/dao/StageDAO.java | 10 +- .../apache/ambari/server/orm/dao/UserDAO.java | 4 +- .../orm/entities/AlertCurrentEntity_.java | 2 +- .../orm/entities/AlertDefinitionEntity.java | 2 +- .../orm/entities/AlertHistoryEntity_.java | 2 +- .../server/orm/entities/AlertNoticeEntity_.java | 2 +- .../server/orm/entities/AlertTargetEntity.java | 4 +- .../orm/entities/HostRoleCommandEntity_.java | 2 +- .../orm/entities/OperatingSystemEntity.java | 2 +- .../server/orm/entities/PrincipalEntity.java | 2 +- .../server/orm/entities/ResourceEntity.java | 2 +- .../server/orm/entities/StageEntity_.java | 2 +- .../ambari/server/orm/entities/UserEntity.java | 2 +- .../ambari/server/orm/entities/ViewEntity.java | 14 +- .../server/orm/entities/ViewInstanceEntity.java | 18 +- .../server/orm/models/HostComponentSummary.java | 2 +- .../ambari/server/proxy/ProxyService.java | 2 +- .../server/security/SecurePasswordHelper.java | 2 +- .../AmbariKerberosAuthenticationProperties.java | 2 +- .../AmbariLdapAuthenticationProvider.java | 4 +- .../AmbariPamAuthenticationProvider.java | 4 +- .../authorization/LdapServerProperties.java | 2 +- .../server/security/authorization/User.java | 2 +- .../server/security/authorization/Users.java | 46 +- .../jwt/JwtAuthenticationProperties.java | 2 +- .../encryption/AbstractCredentialStore.java | 2 +- .../encryption/CredentialStoreServiceImpl.java | 2 +- .../encryption/InMemoryCredentialStore.java | 2 +- .../encryption/MasterKeyServiceImpl.java | 2 +- .../security/ldap/AmbariLdapDataPopulator.java | 18 +- .../server/security/ldap/LdapBatchDto.java | 18 +- .../server/security/ldap/LdapGroupDto.java | 2 +- .../server/security/ldap/LdapSyncDto.java | 4 +- .../security/unsecured/rest/ConnectionInfo.java | 2 +- .../serveraction/ServerActionExecutor.java | 4 +- .../kerberos/ADKerberosOperationHandler.java | 2 +- .../AbstractPrepareKerberosServerAction.java | 6 +- .../kerberos/CreateKeytabFilesServerAction.java | 4 +- .../kerberos/CreatePrincipalsServerAction.java | 2 +- .../kerberos/DestroyPrincipalsServerAction.java | 2 +- .../kerberos/IPAKerberosOperationHandler.java | 4 +- .../kerberos/KerberosOperationHandler.java | 24 +- .../kerberos/MITKerberosOperationHandler.java | 8 +- .../PrepareDisableKerberosServerAction.java | 10 +- .../PrepareEnableKerberosServerAction.java | 4 +- .../PrepareKerberosIdentitiesServerAction.java | 6 +- .../UpdateKerberosConfigsServerAction.java | 10 +- .../upgrades/FinalizeUpgradeAction.java | 12 +- .../upgrades/UpgradeUserKerberosDescriptor.java | 6 +- .../apache/ambari/server/stack/BaseModule.java | 4 +- .../ambari/server/stack/ComponentModule.java | 8 +- .../server/stack/ConfigurationDirectory.java | 6 +- .../ambari/server/stack/ConfigurationInfo.java | 6 +- .../server/stack/ConfigurationModule.java | 6 +- .../ambari/server/stack/ExtensionDirectory.java | 2 +- .../ambari/server/stack/ExtensionModule.java | 8 +- .../apache/ambari/server/stack/HostsType.java | 4 +- .../ambari/server/stack/MasterHostResolver.java | 8 +- .../stack/QuickLinksConfigurationModule.java | 4 +- .../ambari/server/stack/ServiceDirectory.java | 4 +- .../ambari/server/stack/ServiceModule.java | 14 +- .../ambari/server/stack/StackContext.java | 4 +- .../ambari/server/stack/StackDirectory.java | 4 +- .../ambari/server/stack/StackManager.java | 18 +- .../apache/ambari/server/stack/StackModule.java | 18 +- .../apache/ambari/server/stack/ThemeModule.java | 4 +- .../ambari/server/stageplanner/RoleGraph.java | 8 +- .../server/stageplanner/RoleGraphNode.java | 4 +- .../apache/ambari/server/state/CheckHelper.java | 2 +- .../ambari/server/state/ComponentInfo.java | 6 +- .../ambari/server/state/ConfigHelper.java | 2 +- .../apache/ambari/server/state/ConfigImpl.java | 2 +- .../ambari/server/state/ConfigMergeHelper.java | 2 +- .../ambari/server/state/DependencyInfo.java | 2 +- .../ambari/server/state/DesiredConfig.java | 2 +- .../ambari/server/state/ExtensionInfo.java | 6 +- .../apache/ambari/server/state/HostConfig.java | 2 +- .../ambari/server/state/PropertyInfo.java | 10 +- .../server/state/ServiceComponentImpl.java | 6 +- .../apache/ambari/server/state/ServiceInfo.java | 24 +- .../ambari/server/state/ServiceOsSpecific.java | 2 +- .../apache/ambari/server/state/StackInfo.java | 20 +- .../ambari/server/state/UpgradeHelper.java | 10 +- .../state/alert/AggregateDefinitionMapping.java | 6 +- .../state/alert/AlertDefinitionFactory.java | 2 +- .../server/state/alert/AlertDefinitionHash.java | 16 +- .../ambari/server/state/alert/MetricSource.java | 4 +- .../server/state/cluster/ClustersImpl.java | 22 +- .../state/configgroup/ConfigGroupImpl.java | 12 +- .../server/state/fsm/StateMachineFactory.java | 5 +- .../state/host/HostHealthyHeartbeatEvent.java | 2 +- .../kerberos/AbstractKerberosDescriptor.java | 2 +- .../AbstractKerberosDescriptorContainer.java | 22 +- .../KerberosConfigurationDescriptor.java | 6 +- .../state/kerberos/KerberosDescriptor.java | 12 +- .../KerberosDescriptorUpdateHelper.java | 14 +- .../kerberos/KerberosKeytabDescriptor.java | 6 +- .../kerberos/KerberosPrincipalDescriptor.java | 2 +- .../kerberos/KerberosServiceDescriptor.java | 4 +- .../KerberosServiceDescriptorFactory.java | 2 +- .../kerberos/VariableReplacementHelper.java | 4 +- .../quicklinks/QuickLinksConfiguration.java | 4 +- .../ambari/server/state/scheduler/Batch.java | 2 +- .../server/state/scheduler/BatchRequestJob.java | 4 +- .../services/AlertNoticeDispatchService.java | 34 +- .../services/AmbariServerAlertService.java | 2 +- .../server/state/stack/ConfigurationXml.java | 6 +- .../state/stack/ExtensionMetainfoXml.java | 6 +- .../server/state/stack/MetricDefinition.java | 2 +- .../ambari/server/state/stack/OsFamily.java | 8 +- .../server/state/stack/PrerequisiteCheck.java | 4 +- .../server/state/stack/RepositoryXml.java | 4 +- .../server/state/stack/ServiceMetainfoXml.java | 2 +- .../server/state/stack/StackMetainfoXml.java | 2 +- .../state/stack/StackRoleCommandOrder.java | 6 +- .../ambari/server/state/stack/UpgradePack.java | 26 +- .../state/stack/upgrade/ClusterGrouping.java | 8 +- .../state/stack/upgrade/ColocatedGrouping.java | 28 +- .../state/stack/upgrade/ConfigureTask.java | 2 +- .../server/state/stack/upgrade/Grouping.java | 16 +- .../stack/upgrade/RepositoryVersionHelper.java | 2 +- .../stack/upgrade/ServiceCheckGrouping.java | 8 +- .../state/stack/upgrade/StageWrapper.java | 4 +- .../state/stack/upgrade/TaskWrapperBuilder.java | 4 +- .../svccomphost/ServiceComponentHostImpl.java | 2 +- .../ambari/server/state/theme/Layout.java | 4 +- .../ambari/server/state/theme/Placement.java | 4 +- .../ambari/server/state/theme/Section.java | 4 +- .../ambari/server/state/theme/TabLayout.java | 4 +- .../server/state/theme/ThemeConfiguration.java | 8 +- .../ambari/server/topology/AmbariContext.java | 20 +- .../server/topology/BlueprintFactory.java | 6 +- .../ambari/server/topology/BlueprintImpl.java | 24 +- .../server/topology/BlueprintValidatorImpl.java | 30 +- .../topology/ClusterConfigurationRequest.java | 22 +- .../server/topology/ClusterTopologyImpl.java | 14 +- .../ambari/server/topology/Configuration.java | 22 +- .../server/topology/ConfigurationFactory.java | 4 +- .../ambari/server/topology/HostGroupImpl.java | 16 +- .../ambari/server/topology/HostGroupInfo.java | 4 +- .../ambari/server/topology/HostRequest.java | 12 +- .../ambari/server/topology/LogicalRequest.java | 26 +- .../server/topology/PersistedStateImpl.java | 16 +- .../ambari/server/topology/TopologyManager.java | 24 +- .../tasks/PersistHostResourcesTask.java | 4 +- .../validators/ClusterConfigTypeValidator.java | 2 +- .../validators/RequiredPasswordValidator.java | 8 +- .../server/upgrade/AbstractUpgradeCatalog.java | 20 +- .../ambari/server/upgrade/StackUpgradeUtil.java | 2 +- .../server/upgrade/UpgradeCatalog200.java | 22 +- .../server/upgrade/UpgradeCatalog210.java | 42 +- .../server/upgrade/UpgradeCatalog212.java | 16 +- .../server/upgrade/UpgradeCatalog2121.java | 6 +- .../server/upgrade/UpgradeCatalog220.java | 6 +- .../server/upgrade/UpgradeCatalog221.java | 2 +- .../server/upgrade/UpgradeCatalog222.java | 6 +- .../server/upgrade/UpgradeCatalog230.java | 6 +- .../server/upgrade/UpgradeCatalog240.java | 12 +- .../server/upgrade/UpgradeCatalog242.java | 2 +- .../server/upgrade/UpgradeCatalog250.java | 2 +- .../apache/ambari/server/utils/HTTPUtils.java | 2 +- .../server/utils/JaxbMapKeyListAdapter.java | 2 +- .../server/utils/JaxbMapKeyMapAdapter.java | 2 +- .../server/utils/JaxbMapKeyValAdapter.java | 2 +- .../apache/ambari/server/utils/Parallel.java | 12 +- .../apache/ambari/server/utils/SetUtils.java | 4 +- .../ambari/server/utils/ShellCommandUtil.java | 4 +- .../apache/ambari/server/utils/StageUtils.java | 60 +- .../ambari/server/utils/VersionUtils.java | 4 +- .../apache/ambari/server/view/ClusterImpl.java | 2 +- .../ambari/server/view/RemoteAmbariCluster.java | 4 +- .../view/RemoteAmbariClusterRegistry.java | 4 +- .../server/view/RemoteAmbariStreamProvider.java | 4 +- .../server/view/ViewAmbariStreamProvider.java | 4 +- .../ambari/server/view/ViewContextImpl.java | 4 +- .../view/ViewExternalSubResourceProvider.java | 12 +- .../ambari/server/view/ViewExtractor.java | 2 +- .../apache/ambari/server/view/ViewRegistry.java | 32 +- .../server/view/ViewSubResourceDefinition.java | 2 +- .../server/view/ViewSubResourceProvider.java | 12 +- .../server/view/ViewURLStreamProvider.java | 4 +- .../server/view/persistence/DataStoreImpl.java | 20 +- .../ExecutionCommandWrapperTest.java | 28 +- .../actionmanager/TestActionDBAccessorImpl.java | 42 +- .../server/actionmanager/TestActionManager.java | 12 +- .../actionmanager/TestActionScheduler.java | 94 +- .../TestActionSchedulerThreading.java | 4 +- .../ambari/server/actionmanager/TestStage.java | 2 +- .../server/agent/HeartbeatProcessorTest.java | 36 +- .../server/agent/HeartbeatTestHelper.java | 6 +- .../ambari/server/agent/TestActionQueue.java | 12 +- .../server/agent/TestHeartbeatHandler.java | 52 +- .../server/agent/TestHeartbeatMonitor.java | 2 +- .../alerts/AgentHeartbeatAlertRunnableTest.java | 4 +- .../alerts/AmbariPerformanceRunnableTest.java | 4 +- .../server/alerts/StaleAlertRunnableTest.java | 4 +- .../server/api/handlers/CreateHandlerTest.java | 6 +- .../server/api/handlers/DeleteHandlerTest.java | 2 +- .../api/handlers/QueryCreateHandlerTest.java | 98 +- .../server/api/handlers/ReadHandlerTest.java | 4 +- .../server/api/handlers/UpdateHandlerTest.java | 4 +- .../server/api/predicate/QueryLexerTest.java | 40 +- .../server/api/predicate/QueryParserTest.java | 56 +- .../predicate/operators/AndOperatorTest.java | 4 +- .../predicate/operators/EqualsOperatorTest.java | 2 +- .../operators/GreaterEqualsOperatorTest.java | 2 +- .../operators/GreaterOperatorTest.java | 2 +- .../api/predicate/operators/InOperatorTest.java | 6 +- .../operators/LessEqualsOperatorTest.java | 2 +- .../predicate/operators/LessOperatorTest.java | 2 +- .../operators/NotEqualsOperatorTest.java | 2 +- .../predicate/operators/NotOperatorTest.java | 2 +- .../api/predicate/operators/OrOperatorTest.java | 4 +- .../ExtendedResourcePredicateVisitorTest.java | 18 +- .../server/api/query/JpaSortBuilderTest.java | 2 +- .../query/ProcessingPredicateVisitorTest.java | 12 +- .../ambari/server/api/query/QueryImplTest.java | 62 +- .../ambari/server/api/query/QueryInfoTest.java | 2 +- .../render/ClusterBlueprintRendererTest.java | 44 +- .../api/query/render/DefaultRendererTest.java | 32 +- .../render/MetricsPaddingRendererTest.java | 4 +- .../api/query/render/MinimalRendererTest.java | 40 +- .../resources/BaseResourceDefinitionTest.java | 10 +- .../PermissionResourceDefinitionTest.java | 2 +- .../resources/SimpleResourceDefinitionTest.java | 2 +- .../ViewInstanceResourceDefinitionTest.java | 2 +- .../server/api/services/ActionServiceTest.java | 2 +- .../server/api/services/AmbariMetaInfoTest.java | 10 +- .../server/api/services/BaseServiceTest.java | 2 +- .../api/services/BlueprintServiceTest.java | 2 +- .../ClusterKerberosDescriptorServiceTest.java | 2 +- .../services/ClusterPrivilegeServiceTest.java | 2 +- .../server/api/services/ClusterServiceTest.java | 2 +- .../ClusterStackVersionServiceTest.java | 2 +- .../api/services/ComponentServiceTest.java | 2 +- .../api/services/ConfigGroupServiceTest.java | 2 +- .../api/services/ConfigurationServiceTest.java | 2 +- .../api/services/CredentialServiceTest.java | 2 +- .../api/services/ExtensionsServiceTest.java | 2 +- .../server/api/services/FeedServiceTest.java | 2 +- .../api/services/GroupPrivilegeServiceTest.java | 4 +- .../server/api/services/GroupServiceTest.java | 2 +- .../api/services/HostComponentServiceTest.java | 2 +- .../HostKerberosIdentityServiceTest.java | 2 +- .../server/api/services/HostServiceTest.java | 2 +- .../services/HostStackVersionServiceTest.java | 2 +- .../api/services/InstanceServiceTest.java | 2 +- .../server/api/services/JobServiceTest.java | 2 +- .../api/services/LdapSyncEventServiceTest.java | 2 +- .../server/api/services/MemberServiceTest.java | 2 +- .../api/services/NamedPropertySetTest.java | 6 +- .../api/services/PermissionServiceTest.java | 2 +- .../services/PersistenceManagerImplTest.java | 32 +- .../services/PreUpgradeCheckServiceTest.java | 2 +- .../api/services/PrivilegeServiceTest.java | 2 +- .../api/services/RecommendationServiceTest.java | 2 +- .../api/services/RepositoryServiceTest.java | 2 +- .../server/api/services/RequestFactoryTest.java | 18 +- .../services/RoleAuthorizationServiceTest.java | 2 +- .../api/services/RootServiceServiceTest.java | 2 +- .../server/api/services/ServiceServiceTest.java | 2 +- .../server/api/services/StacksServiceTest.java | 2 +- .../api/services/TargetClusterServiceTest.java | 2 +- .../api/services/TaskAttemptServiceTest.java | 2 +- .../api/services/UpgradeItemServiceTest.java | 2 +- .../services/UserAuthorizationServiceTest.java | 2 +- .../api/services/UserPrivilegeServiceTest.java | 4 +- .../api/services/ValidationServiceTest.java | 2 +- .../api/services/ViewPermissionServiceTest.java | 2 +- .../services/ViewSubResourceServiceTest.java | 12 +- .../api/services/WorkflowServiceTest.java | 2 +- .../parsers/JsonRequestBodyParserTest.java | 20 +- .../serializers/JsonSerializerTest.java | 16 +- .../StackAdvisorBlueprintProcessorTest.java | 26 +- .../ConfigurationRecommendationCommandTest.java | 12 +- .../audit/request/AllPostAndPutCreator.java | 2 +- .../creator/RequestEventCreatorTest.java | 2 +- .../ambari/server/bootstrap/BootStrapTest.java | 6 +- .../checks/AbstractCheckDescriptorTest.java | 2 +- .../checks/ClientRetryPropertyCheckTest.java | 8 +- .../checks/ComponentsInstallationCheckTest.java | 12 +- .../checks/ConfigurationMergeCheckTest.java | 2 +- .../HiveDynamicServiceDiscoveryCheckTest.java | 6 +- .../checks/HiveMultipleMetastoreCheckTest.java | 8 +- .../checks/HostsMasterMaintenanceCheckTest.java | 2 +- .../checks/HostsRepositoryVersionCheckTest.java | 6 +- .../server/checks/InstallPackagesCheckTest.java | 6 +- ...duce2JobHistoryStatePreservingCheckTest.java | 6 +- .../server/checks/RangerAuditDbCheckTest.java | 4 +- .../server/checks/RangerPasswordCheckTest.java | 2 +- .../server/checks/RangerSSLConfigCheckTest.java | 4 +- .../server/checks/ServicePresenceCheckTest.java | 22 +- ...vicesMapReduceDistributedCacheCheckTest.java | 10 +- ...rvicesNamenodeHighAvailabilityCheckTest.java | 2 +- .../ServicesNamenodeTruncateCheckTest.java | 2 +- .../ServicesTezDistributedCacheCheckTest.java | 10 +- .../server/checks/ServicesUpCheckTest.java | 10 +- .../ServicesYarnWorkPreservingCheckTest.java | 2 +- ...nTimelineServerStatePreservingCheckTest.java | 12 +- .../collections/functors/AndPredicateTest.java | 8 +- .../functors/ContainsPredicateTest.java | 8 +- .../functors/ContextTransformerTest.java | 8 +- .../functors/EqualsPredicateTest.java | 4 +- .../collections/functors/NotPredicateTest.java | 2 +- .../collections/functors/OrPredicateTest.java | 8 +- .../AmbariCustomCommandExecutionHelperTest.java | 12 +- .../controller/AmbariHandlerListTest.java | 6 +- .../AmbariManagementControllerImplTest.java | 64 +- .../AmbariManagementControllerTest.java | 384 ++-- .../BackgroundCustomCommandExecutionTest.java | 8 +- .../server/controller/ClusterRequestTest.java | 2 +- .../server/controller/ClusterResponseTest.java | 2 +- .../server/controller/KerberosHelperTest.java | 2 +- .../server/controller/LdapSyncRequestTest.java | 8 +- .../controller/MaintenanceStateHelperTest.java | 4 +- ...hYarnCapacitySchedulerReleaseConfigTest.java | 8 +- .../AbstractControllerResourceProviderTest.java | 4 +- .../AbstractDRResourceProviderTest.java | 4 +- .../AbstractJDBCResourceProviderTest.java | 4 +- .../internal/AbstractResourceProviderTest.java | 36 +- .../internal/ActionResourceProviderTest.java | 8 +- .../AlertDefinitionResourceProviderTest.java | 10 +- .../AlertGroupResourceProviderTest.java | 38 +- .../internal/AlertResourceProviderTest.java | 4 +- .../AlertTargetResourceProviderTest.java | 22 +- .../AmbariPrivilegeResourceProviderTest.java | 44 +- .../internal/ArtifactResourceProviderTest.java | 68 +- .../internal/BaseBlueprintProcessorTest.java | 12 +- .../controller/internal/BaseProviderTest.java | 32 +- .../BlueprintConfigurationProcessorTest.java | 1690 +++++++++--------- .../internal/BlueprintResourceProviderTest.java | 68 +- .../internal/CalculatedStatusTest.java | 12 +- .../ClientConfigResourceProviderTest.java | 104 +- .../internal/ClusterControllerImplTest.java | 104 +- ...rKerberosDescriptorResourceProviderTest.java | 52 +- .../ClusterPrivilegeResourceProviderTest.java | 28 +- .../internal/ClusterResourceProviderTest.java | 70 +- ...ClusterStackVersionResourceProviderTest.java | 60 +- ...leRepositoryVersionResourceProviderTest.java | 4 +- .../internal/ComponentResourceProviderTest.java | 32 +- .../ConfigGroupResourceProviderTest.java | 76 +- .../ConfigurationResourceProviderTest.java | 16 +- .../CredentialResourceProviderTest.java | 8 +- .../internal/ExportBlueprintRequestTest.java | 2 +- .../internal/ExtensionResourceProviderTest.java | 6 +- .../internal/FeedResourceProviderTest.java | 24 +- .../GroupPrivilegeResourceProviderTest.java | 4 +- .../internal/GroupResourceProviderTest.java | 10 +- .../HostComponentResourceProviderTest.java | 38 +- ...ostKerberosIdentityResourceProviderTest.java | 10 +- .../internal/HostResourceProviderTest.java | 56 +- .../internal/InstanceResourceProviderTest.java | 16 +- .../internal/JMXHostProviderTest.java | 36 +- .../internal/JobResourceProviderTest.java | 12 +- .../LdapSyncEventResourceProviderTest.java | 18 +- .../internal/MemberResourceProviderTest.java | 6 +- .../internal/PageResponseImplTest.java | 8 +- .../PermissionResourceProviderTest.java | 2 +- .../PreUpgradeCheckResourceProviderTest.java | 8 +- .../internal/ProvisionClusterRequestTest.java | 56 +- .../internal/QueryResponseImplTest.java | 8 +- .../RemoteClusterResourceProviderTest.java | 8 +- .../RepositoryResourceProviderTest.java | 8 +- .../RepositoryVersionResourceProviderTest.java | 28 +- .../internal/RequestOperationLevelTest.java | 2 +- .../internal/RequestResourceProviderTest.java | 82 +- .../RequestScheduleResourceProviderTest.java | 45 +- .../internal/RequestStageContainerTest.java | 12 +- .../RoleAuthorizationResourceProviderTest.java | 6 +- ...ootServiceComponentPropertyProviderTest.java | 2 +- ...ootServiceComponentResourceProviderTest.java | 6 +- ...erviceHostComponentResourceProviderTest.java | 8 +- .../RootServiceResourceProviderTest.java | 6 +- .../internal/ScaleClusterRequestTest.java | 16 +- .../controller/internal/SchemaImplTest.java | 12 +- .../internal/ServiceResourceProviderTest.java | 36 +- .../SimplifyingPredicateVisitorTest.java | 2 +- .../StackAdvisorResourceProviderTest.java | 18 +- .../StackArtifactResourceProviderTest.java | 6 +- ...igurationDependencyResourceProviderTest.java | 4 +- .../StackConfigurationResourceProviderTest.java | 12 +- .../StackDefinedPropertyProviderTest.java | 20 +- .../StackDependencyResourceProviderTest.java | 44 +- ...kLevelConfigurationResourceProviderTest.java | 12 +- .../internal/StackResourceProviderTest.java | 6 +- .../server/controller/internal/StackTest.java | 8 +- .../internal/StageResourceProviderTest.java | 6 +- .../TargetClusterResourceProviderTest.java | 22 +- .../TaskAttemptResourceProviderTest.java | 6 +- .../internal/TaskResourceProviderTest.java | 10 +- .../controller/internal/TestIvoryService.java | 18 +- .../internal/URLStreamProviderTest.java | 4 +- .../UpgradeSummaryResourceProviderTest.java | 2 +- .../UserPrivilegeResourceProviderTest.java | 10 +- .../internal/UserResourceProviderDBTest.java | 16 +- .../VersionDefinitionResourceProviderTest.java | 12 +- .../ViewInstanceResourceProviderTest.java | 20 +- .../ViewPermissionResourceProviderTest.java | 4 +- .../ViewPrivilegeResourceProviderTest.java | 6 +- .../internal/ViewURLResourceProviderTest.java | 2 +- .../WidgetLayoutResourceProviderTest.java | 14 +- .../internal/WorkflowResourceProviderTest.java | 6 +- .../server/controller/ivory/FeedTest.java | 30 +- .../controller/jmx/TestStreamProvider.java | 2 +- .../LoggingRequestHelperFactoryImplTest.java | 4 +- .../logging/LoggingRequestHelperImplTest.java | 12 +- .../LoggingSearchPropertyProviderTest.java | 4 +- .../metrics/JMXPropertyProviderTest.java | 24 +- .../RestMetricsPropertyProviderTest.java | 24 +- .../metrics/ganglia/GangliaMetricTest.java | 4 +- .../ganglia/GangliaPropertyProviderTest.java | 52 +- .../GangliaReportPropertyProviderTest.java | 2 +- .../metrics/ganglia/TestStreamProvider.java | 2 +- .../timeline/AMSPropertyProviderTest.java | 28 +- .../timeline/AMSReportPropertyProviderTest.java | 4 +- .../timeline/MetricsPaddingMethodTest.java | 14 +- .../timeline/MetricsRequestHelperTest.java | 2 +- .../timeline/cache/TimelineMetricCacheTest.java | 16 +- .../controller/predicate/AndPredicateTest.java | 12 +- .../predicate/CategoryIsEmptyPredicateTest.java | 2 +- .../predicate/EqualsPredicateTest.java | 8 +- .../predicate/GreaterEqualsPredicateTest.java | 4 +- .../predicate/GreaterPredicateTest.java | 6 +- .../predicate/LessEqualsPredicateTest.java | 4 +- .../controller/predicate/LessPredicateTest.java | 4 +- .../controller/predicate/NotPredicateTest.java | 4 +- .../controller/predicate/OrPredicateTest.java | 12 +- .../predicate/PredicateVisitorTest.java | 2 +- ...ThreadPoolExecutorCompletionServiceTest.java | 6 +- .../utilities/PropertyHelperTest.java | 12 +- .../utilities/webserver/StartServer.java | 2 +- .../credentialapi/CredentialUtilTest.java | 12 +- .../apache/ambari/server/events/EventsTest.java | 2 +- .../ambari/server/events/MockEventListener.java | 8 +- .../listeners/tasks/TaskStatusListenerTest.java | 4 +- .../AlertMaintenanceModeListenerTest.java | 2 +- .../HostVersionOutOfSyncListenerTest.java | 28 +- .../server/hooks/users/UserHookServiceTest.java | 2 +- .../server/metadata/RoleCommandOrderTest.java | 4 +- .../dispatchers/AlertScriptDispatcherTest.java | 2 +- .../dispatchers/AmbariSNMPDispatcherTest.java | 58 +- .../dispatchers/EmailDispatcherTest.java | 12 +- .../dispatchers/SNMPDispatcherTest.java | 60 +- .../ambari/server/orm/DBAccessorImplTest.java | 10 +- .../apache/ambari/server/orm/OrmTestHelper.java | 8 +- .../apache/ambari/server/orm/TestOrmImpl.java | 2 +- .../server/orm/dao/AlertDefinitionDAOTest.java | 2 +- .../ambari/server/orm/dao/AlertsDAOTest.java | 4 +- .../server/orm/dao/ConfigGroupDAOTest.java | 8 +- .../server/orm/dao/HostVersionDAOTest.java | 4 +- .../ambari/server/orm/dao/RequestDAOTest.java | 2 +- .../ambari/server/orm/dao/StageDAOTest.java | 4 +- .../ambari/server/orm/dao/UpgradeDAOTest.java | 2 +- .../ambari/server/orm/dao/WidgetDAOTest.java | 2 +- .../server/orm/dao/WidgetLayoutDAOTest.java | 2 +- .../apache/ambari/server/orm/db/DDLTests.java | 6 +- .../orm/entities/LdapSyncSpecEntityTest.java | 4 +- .../orm/entities/PrincipalEntityTest.java | 4 +- .../orm/entities/ViewInstanceEntityTest.java | 2 +- .../ambari/server/proxy/ProxyServiceTest.java | 28 +- .../scheduler/ExecutionScheduleManagerTest.java | 10 +- .../AmbariServerSecurityHeaderFilterTest.java | 4 +- .../AmbariViewsSecurityHeaderFilterTest.java | 4 +- .../server/security/CertificateManagerTest.java | 2 +- .../security/SecurePasswordHelperTest.java | 2 +- ...ariKerberosAuthenticationPropertiesTest.java | 6 +- .../AmbariPamAuthenticationProviderTest.java | 2 +- .../authorization/AuthorizationHelperTest.java | 4 +- .../security/authorization/UsersTest.java | 4 +- .../encryption/MasterKeyServiceTest.java | 4 +- .../ldap/AmbariLdapDataPopulatorTest.java | 20 +- .../security/ldap/LdapPerformanceTest.java | 4 +- .../ADKerberosOperationHandlerTest.java | 4 +- .../FinalizeKerberosServerActionTest.java | 4 +- .../kerberos/KerberosOperationHandlerTest.java | 2 +- .../kerberos/KerberosServerActionTest.java | 12 +- .../UpdateKerberosConfigsServerActionTest.java | 8 +- .../AutoSkipFailedSummaryActionTest.java | 8 +- .../ComponentVersionCheckActionTest.java | 12 +- .../upgrades/FixOozieAdminUsersTest.java | 2 +- .../upgrades/FixYarnWebServiceUrlTest.java | 8 +- .../HBaseEnvMaxDirectMemorySizeActionTest.java | 2 +- .../upgrades/HiveEnvClasspathActionTest.java | 2 +- .../upgrades/KerberosKeytabsActionTest.java | 6 +- .../upgrades/RangerConfigCalculationTest.java | 4 +- .../RangerKerberosConfigCalculationTest.java | 2 +- .../upgrades/RangerKmsProxyConfigTest.java | 2 +- .../RangerWebAlertConfigActionTest.java | 4 +- .../upgrades/UpgradeActionTest.java | 30 +- .../UpgradeUserKerberosDescriptorTest.java | 4 +- .../server/stack/ComponentModuleTest.java | 22 +- .../ambari/server/stack/ServiceModuleTest.java | 76 +- .../stack/StackManagerCommonServicesTest.java | 2 +- .../server/stack/StackManagerExtensionTest.java | 2 +- .../ambari/server/stack/StackManagerTest.java | 10 +- .../ambari/server/stack/StackModuleTest.java | 2 +- .../ambari/server/state/CheckHelperTest.java | 10 +- .../ambari/server/state/ConfigGroupTest.java | 16 +- .../ambari/server/state/PropertyInfoTest.java | 2 +- .../server/state/RequestExecutionTest.java | 4 +- .../server/state/ServiceComponentTest.java | 6 +- .../ambari/server/state/ServiceInfoTest.java | 2 +- .../apache/ambari/server/state/ServiceTest.java | 4 +- .../state/alerts/AlertDefinitionHashTest.java | 16 +- .../alerts/AlertStateChangedEventTest.java | 24 +- .../state/cluster/ClusterDeadlockTest.java | 16 +- .../server/state/cluster/ClusterImplTest.java | 14 +- .../state/cluster/ClustersDeadlockTest.java | 6 +- .../server/state/cluster/ClustersImplTest.java | 4 +- .../ConcurrentServiceConfigVersionTest.java | 4 +- ...omponentHostConcurrentWriteDeadlockTest.java | 8 +- .../KerberosComponentDescriptorTest.java | 14 +- .../KerberosConfigurationDescriptorTest.java | 14 +- .../state/kerberos/KerberosDescriptorTest.java | 26 +- .../KerberosIdentityDescriptorTest.java | 18 +- .../kerberos/KerberosKeytabDescriptorTest.java | 6 +- .../KerberosPrincipalDescriptorTest.java | 4 +- .../kerberos/KerberosServiceDescriptorTest.java | 16 +- .../kerberos/VariableReplacementHelperTest.java | 16 +- .../state/scheduler/BatchRequestJobTest.java | 4 +- .../AlertNoticeDispatchServiceTest.java | 10 +- .../ambari/server/state/stack/OSFamilyTest.java | 16 +- .../upgrade/RepositoryVersionHelperTest.java | 2 +- .../svccomphost/ServiceComponentHostTest.java | 24 +- .../server/testing/DeadlockWarningThread.java | 4 +- .../server/testing/DeadlockedThreadsTest.java | 2 +- .../server/topology/AmbariContextTest.java | 32 +- .../server/topology/BlueprintFactoryTest.java | 6 +- .../server/topology/BlueprintImplTest.java | 18 +- .../topology/BlueprintValidatorImplTest.java | 20 +- .../ClusterConfigurationRequestTest.java | 10 +- .../ClusterDeployWithStartOnlyTest.java | 12 +- ...InstallWithoutStartOnComponentLevelTest.java | 12 +- .../ClusterInstallWithoutStartTest.java | 12 +- .../topology/ClusterTopologyImplTest.java | 22 +- .../topology/ConfigurationFactoryTest.java | 14 +- .../server/topology/ConfigurationTest.java | 106 +- .../topology/RequiredPasswordValidatorTest.java | 24 +- .../ambari/server/topology/SettingTest.java | 6 +- .../server/topology/TopologyManagerTest.java | 12 +- .../ClusterConfigTypeValidatorTest.java | 14 +- .../upgrade/AbstractUpgradeCatalogTest.java | 6 +- .../server/upgrade/UpgradeCatalog200Test.java | 12 +- .../server/upgrade/UpgradeCatalog210Test.java | 32 +- .../server/upgrade/UpgradeCatalog212Test.java | 8 +- .../server/upgrade/UpgradeCatalog220Test.java | 8 +- .../server/upgrade/UpgradeCatalog221Test.java | 10 +- .../server/upgrade/UpgradeCatalog230Test.java | 2 +- .../server/upgrade/UpgradeCatalog240Test.java | 34 +- .../server/upgrade/UpgradeCatalog242Test.java | 4 +- .../server/upgrade/UpgradeCatalog250Test.java | 54 +- .../ambari/server/upgrade/UpgradeTest.java | 2 +- .../ambari/server/utils/SetUtilsTest.java | 10 +- .../ambari/server/utils/StageUtilsTest.java | 40 +- .../ambari/server/utils/TestParallel.java | 8 +- .../ambari/server/view/ClusterImplTest.java | 4 +- .../view/ViewAmbariStreamProviderTest.java | 16 +- .../ambari/server/view/ViewExtractorTest.java | 6 +- .../ambari/server/view/ViewRegistryTest.java | 40 +- .../view/ViewSubResourceProviderTest.java | 6 +- .../server/view/ViewURLStreamProviderTest.java | 44 +- .../server/view/events/EventImplTest.java | 2 +- .../view/persistence/DataStoreImplTest.java | 4 +- .../InstanceValidationResultImplTest.java | 2 +- 926 files changed, 5822 insertions(+), 5832 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java index 99e714d..78ed4ef 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/KdcServerConnectionVerification.java @@ -134,7 +134,7 @@ public class KdcServerConnectionVerification { config.setUseUdp(ConnectionProtocol.UDP == connectionProtocol); config.setTimeout(timeoutMillis); - FutureTask<Boolean> future = new FutureTask<Boolean>(new Callable<Boolean>() { + FutureTask<Boolean> future = new FutureTask<>(new Callable<Boolean>() { @Override public Boolean call() { Boolean success; @@ -146,8 +146,8 @@ public class KdcServerConnectionVerification { connection.getTgt("noUser@noRealm", "noPassword"); LOG.info(String.format("Encountered no Exceptions while testing connectivity to the KDC:\n" + - "**** Host: %s:%d (%s)", - server, port, connectionProtocol.name())); + "**** Host: %s:%d (%s)", + server, port, connectionProtocol.name())); success = true; } catch (KerberosException e) { KrbError error = e.getError(); @@ -155,11 +155,10 @@ public class KdcServerConnectionVerification { String errorCodeMessage; int errorCodeCode; - if(errorCode != null) { + if (errorCode != null) { errorCodeMessage = errorCode.getMessage(); errorCodeCode = errorCode.getValue(); - } - else { + } else { errorCodeMessage = "<Not Specified>"; errorCodeCode = -1; } @@ -167,10 +166,10 @@ public class KdcServerConnectionVerification { // unfortunately, need to look at msg as error 60 is a generic error code //todo: evaluate other error codes to provide better information //todo: as there may be other error codes where we should return false - success = !(errorCodeCode == ErrorType.KRB_ERR_GENERIC.getValue() && - errorCodeMessage.contains("TimeOut")); + success = !(errorCodeCode == ErrorType.KRB_ERR_GENERIC.getValue() && + errorCodeMessage.contains("TimeOut")); - if(!success || LOG.isDebugEnabled()) { + if (!success || LOG.isDebugEnabled()) { KerberosMessageType messageType = error.getMessageType(); String messageTypeMessage; @@ -184,12 +183,12 @@ public class KdcServerConnectionVerification { } String message = String.format("Received KerberosException while testing connectivity to the KDC: %s\n" + - "**** Host: %s:%d (%s)\n" + - "**** Error: %s\n" + - "**** Code: %d (%s)\n" + - "**** Message: %d (%s)", - e.getLocalizedMessage(), server, port, connectionProtocol.name(), error.getEText(), errorCodeCode, - errorCodeMessage, messageTypeCode, messageTypeMessage); + "**** Host: %s:%d (%s)\n" + + "**** Error: %s\n" + + "**** Code: %d (%s)\n" + + "**** Message: %d (%s)", + e.getLocalizedMessage(), server, port, connectionProtocol.name(), error.getEText(), errorCodeCode, + errorCodeMessage, messageTypeCode, messageTypeMessage); if (LOG.isDebugEnabled()) { LOG.info(message, e); @@ -199,7 +198,7 @@ public class KdcServerConnectionVerification { } } catch (Throwable e) { LOG.info(String.format("Received Exception while testing connectivity to the KDC: %s\n**** Host: %s:%d (%s)", - e.getLocalizedMessage(), server, port, connectionProtocol.name()), e); + e.getLocalizedMessage(), server, port, connectionProtocol.name()), e); // some bad unexpected thing occurred throw new RuntimeException(e); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/Role.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/Role.java b/ambari-server/src/main/java/org/apache/ambari/server/Role.java index 1fceb29..b32a909 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/Role.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/Role.java @@ -29,7 +29,7 @@ import java.util.concurrent.ConcurrentHashMap; */ public class Role { - private static final Map<String, Role> roles = new ConcurrentHashMap<String, Role>(); + private static final Map<String, Role> roles = new ConcurrentHashMap<>(); /** * @param name the role name http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionDBAccessorImpl.java ---------------------------------------------------------------------- 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 14f02d2..ab4feaa 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 @@ -357,7 +357,7 @@ public class ActionDBAccessorImpl implements ActionDBAccessor { requestDAO.create(requestEntity); //TODO wire request to cluster - List<StageEntity> stageEntities = new ArrayList<StageEntity>(request.getStages().size()); + List<StageEntity> stageEntities = new ArrayList<>(request.getStages().size()); addRequestToAuditlogCache(request); @@ -503,17 +503,17 @@ public class ActionDBAccessorImpl implements ActionDBAccessor { @Override public void updateHostRoleStates(Collection<CommandReport> reports) { - Map<Long, CommandReport> taskReports = new HashMap<Long, CommandReport>(); + Map<Long, CommandReport> taskReports = new HashMap<>(); for (CommandReport report : reports) { taskReports.put(report.getTaskId(), report); } long now = System.currentTimeMillis(); - List<Long> requestsToCheck = new ArrayList<Long>(); + List<Long> requestsToCheck = new ArrayList<>(); List<HostRoleCommandEntity> commandEntities = hostRoleCommandDAO.findByPKs(taskReports.keySet()); - List<HostRoleCommandEntity> commandEntitiesToMerge = new ArrayList<HostRoleCommandEntity>(); + List<HostRoleCommandEntity> commandEntitiesToMerge = new ArrayList<>(); for (HostRoleCommandEntity commandEntity : commandEntities) { CommandReport report = taskReports.get(commandEntity.getTaskId()); HostRoleStatus existingTaskStatus = commandEntity.getStatus(); @@ -704,12 +704,12 @@ public class ActionDBAccessorImpl implements ActionDBAccessor { return Collections.emptyList(); } - List<HostRoleCommand> commands = new ArrayList<HostRoleCommand>(); + List<HostRoleCommand> commands = new ArrayList<>(); Map<Long, HostRoleCommand> cached = hostRoleCommandCache.getAllPresent(taskIds); commands.addAll(cached.values()); - List<Long> absent = new ArrayList<Long>(); + List<Long> absent = new ArrayList<>(); absent.addAll(taskIds); absent.removeAll(cached.keySet()); @@ -798,7 +798,7 @@ public class ActionDBAccessorImpl implements ActionDBAccessor { @Override public List<Request> getRequests(Collection<Long> requestIds) { List<RequestEntity> requestEntities = requestDAO.findByPks(requestIds); - List<Request> requests = new ArrayList<Request>(requestEntities.size()); + List<Request> requests = new ArrayList<>(requestEntities.size()); for (RequestEntity requestEntity : requestEntities) { requests.add(requestFactory.createExisting(requestEntity)); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java index 237214d..398bc9d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionManager.java @@ -142,7 +142,7 @@ public class ActionManager { return (int) (o1.getTaskId()-o2.getTaskId()); } }); - List<CommandReport> reportsToProcess = new ArrayList<CommandReport>(); + List<CommandReport> reportsToProcess = new ArrayList<>(); //persist the action response into the db. for (CommandReport report : reports) { HostRoleCommand command = commands.get(report.getTaskId()); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ActionScheduler.java ---------------------------------------------------------------------- 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 c8e4532..0984c5c 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 @@ -161,7 +161,7 @@ class ActionScheduler implements Runnable { private final Object wakeupSyncObject = new Object(); private final ServerActionExecutor serverActionExecutor; - private final Set<Long> requestsInProgress = new HashSet<Long>(); + private final Set<Long> requestsInProgress = new HashSet<>(); /** * Contains request ids that have been scheduled to be cancelled, @@ -176,7 +176,7 @@ class ActionScheduler implements Runnable { * requestsToBeCancelled object */ private final Map<Long, String> requestCancelReasons = - new HashMap<Long, String>(); + new HashMap<>(); /** * true if scheduler should run ASAP. @@ -354,7 +354,7 @@ class ActionScheduler implements Runnable { return; } - Set<Long> runningRequestIds = new HashSet<Long>(); + Set<Long> runningRequestIds = new HashSet<>(); List<Stage> stages = db.getStagesInProgress(); if (LOG.isDebugEnabled()) { LOG.debug("Scheduler wakes up"); @@ -453,8 +453,8 @@ class ActionScheduler implements Runnable { return; } - List<ExecutionCommand> commandsToStart = new ArrayList<ExecutionCommand>(); - List<ExecutionCommand> commandsToUpdate = new ArrayList<ExecutionCommand>(); + List<ExecutionCommand> commandsToStart = new ArrayList<>(); + List<ExecutionCommand> commandsToUpdate = new ArrayList<>(); //Schedule what we have so far @@ -468,7 +468,7 @@ class ActionScheduler implements Runnable { //Multimap is analog of Map<Object, List<Object>> but allows to avoid nested loop ListMultimap<String, ServiceComponentHostEvent> eventMap = formEventMap(stage, commandsToStart); - Map<ExecutionCommand, String> commandsToAbort = new HashMap<ExecutionCommand, String>(); + Map<ExecutionCommand, String> commandsToAbort = new HashMap<>(); if (!eventMap.isEmpty()) { LOG.debug("==> processing {} serviceComponentHostEvents...", eventMap.size()); Cluster cluster = clusters.getCluster(stage.getClusterName()); @@ -501,7 +501,7 @@ class ActionScheduler implements Runnable { if (commandsToAbort.size() > 0) { // Code branch may be a bit slow, but is extremely rarely used LOG.debug("==> Aborting {} tasks...", commandsToAbort.size()); // Build a list of HostRoleCommands - List<Long> taskIds = new ArrayList<Long>(); + List<Long> taskIds = new ArrayList<>(); for (ExecutionCommand command : commandsToAbort.keySet()) { taskIds.add(command.getTaskId()); } @@ -571,7 +571,7 @@ class ActionScheduler implements Runnable { * @return */ private HashSet<String> getListOfHostsWithPendingTask(List<Stage> stages) { - HashSet<String> hostsWithTasks = new HashSet<String>(); + HashSet<String> hostsWithTasks = new HashSet<>(); for (Stage s : stages) { hostsWithTasks.addAll(s.getHosts()); } @@ -604,9 +604,9 @@ class ActionScheduler implements Runnable { * @return a list of stages that may be executed in parallel */ private List<Stage> filterParallelPerHostStages(List<Stage> stages) { - List<Stage> retVal = new ArrayList<Stage>(); - Set<String> affectedHosts = new HashSet<String>(); - Set<Long> affectedRequests = new HashSet<Long>(); + List<Stage> retVal = new ArrayList<>(); + Set<String> affectedHosts = new HashSet<>(); + Set<Long> affectedRequests = new HashSet<>(); for (Stage s : stages) { long requestId = s.getRequestId(); @@ -697,8 +697,8 @@ class ActionScheduler implements Runnable { return false; } - Map<Role, Integer> hostCountsForRoles = new HashMap<Role, Integer>(); - Map<Role, Integer> failedHostCountsForRoles = new HashMap<Role, Integer>(); + Map<Role, Integer> hostCountsForRoles = new HashMap<>(); + Map<Role, Integer> failedHostCountsForRoles = new HashMap<>(); for (String host : prevStage.getHostRoleCommands().keySet()) { Map<String, HostRoleCommand> roleCommandMap = prevStage.getHostRoleCommands().get(host); @@ -1008,9 +1008,9 @@ class ActionScheduler implements Runnable { */ private Map<String, RoleStats> initRoleStats(Stage s) { // Meaning: how many hosts are affected by commands for each role - Map<Role, Integer> hostCountsForRoles = new HashMap<Role, Integer>(); + Map<Role, Integer> hostCountsForRoles = new HashMap<>(); // < role_name, rolestats > - Map<String, RoleStats> roleStats = new TreeMap<String, RoleStats>(); + Map<String, RoleStats> roleStats = new TreeMap<>(); for (String host : s.getHostRoleCommands().keySet()) { Map<String, HostRoleCommand> roleCommandMap = s.getHostRoleCommands().get(host); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java index 502c016..10e0d57 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Request.java @@ -78,7 +78,7 @@ public class Request { private RequestOperationLevel operationLevel; private RequestType requestType; - private Collection<Stage> stages = new ArrayList<Stage>(); + private Collection<Stage> stages = new ArrayList<>(); @Inject private static HostDAO hostDAO; @@ -207,7 +207,7 @@ public class Request { } private static List<String> getHostsList(String hosts) { - List<String> hostList = new ArrayList<String>(); + List<String> hostList = new ArrayList<>(); if (hosts != null && !hosts.isEmpty()) { for (String host : hosts.split(",")) { if (!host.trim().isEmpty()) { @@ -248,7 +248,7 @@ public class Request { //TODO set all fields if (resourceFilters != null) { - List<RequestResourceFilterEntity> filterEntities = new ArrayList<RequestResourceFilterEntity>(); + List<RequestResourceFilterEntity> filterEntities = new ArrayList<>(); for (RequestResourceFilter resourceFilter : resourceFilters) { RequestResourceFilterEntity filterEntity = new RequestResourceFilterEntity(); filterEntity.setServiceName(resourceFilter.getServiceName()); @@ -367,7 +367,7 @@ public class Request { } public List<HostRoleCommand> getCommands() { - List<HostRoleCommand> commands = new ArrayList<HostRoleCommand>(); + List<HostRoleCommand> commands = new ArrayList<>(); for (Stage stage : stages) { commands.addAll(stage.getOrderedHostRoleCommands()); } @@ -420,7 +420,7 @@ public class Request { Collection<RequestResourceFilterEntity> resourceFilterEntities = entity.getResourceFilterEntities(); if (resourceFilterEntities != null) { - resourceFilters = new ArrayList<RequestResourceFilter>(); + resourceFilters = new ArrayList<>(); for (RequestResourceFilterEntity resourceFilterEntity : resourceFilterEntities) { RequestResourceFilter resourceFilter = new RequestResourceFilter( http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java index f7ceca2..cca279b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/Stage.java @@ -90,13 +90,13 @@ public class Stage { private volatile boolean wrappersLoaded = false; //Map of roles to successFactors for this stage. Default is 1 i.e. 100% - private Map<Role, Float> successFactors = new HashMap<Role, Float>(); + private Map<Role, Float> successFactors = new HashMap<>(); //Map of host to host-roles Map<String, Map<String, HostRoleCommand>> hostRoleCommands = - new TreeMap<String, Map<String, HostRoleCommand>>(); + new TreeMap<>(); private Map<String, List<ExecutionCommandWrapper>> commandsToSend = - new TreeMap<String, List<ExecutionCommandWrapper>>(); + new TreeMap<>(); @Inject private HostRoleCommandFactory hostRoleCommandFactory; @@ -237,7 +237,7 @@ public class Stage { } public List<HostRoleCommand> getOrderedHostRoleCommands() { - List<HostRoleCommand> commands = new ArrayList<HostRoleCommand>(); + List<HostRoleCommand> commands = new ArrayList<>(); //Correct due to ordered maps for (Map.Entry<String, Map<String, HostRoleCommand>> hostRoleCommandEntry : hostRoleCommands.entrySet()) { for (Map.Entry<String, HostRoleCommand> roleCommandEntry : hostRoleCommandEntry.getValue().entrySet()) { @@ -491,7 +491,7 @@ public class Stage { ExecutionCommand cmd = commandWrapper.getExecutionCommand(); - Map<String, String> cmdParams = new HashMap<String, String>(); + Map<String, String> cmdParams = new HashMap<>(); if (commandParams != null) { cmdParams.putAll(commandParams); } @@ -500,18 +500,18 @@ public class Stage { } cmd.setCommandParams(cmdParams); - Map<String, Map<String, String>> configurations = new TreeMap<String, Map<String, String>>(); + Map<String, Map<String, String>> configurations = new TreeMap<>(); cmd.setConfigurations(configurations); - Map<String, Map<String, Map<String, String>>> configurationAttributes = new TreeMap<String, Map<String, Map<String, String>>>(); + Map<String, Map<String, Map<String, String>>> configurationAttributes = new TreeMap<>(); cmd.setConfigurationAttributes(configurationAttributes); if (configTags == null) { - configTags = new TreeMap<String, Map<String, String>>(); + configTags = new TreeMap<>(); } cmd.setConfigurationTags(configTags); - Map<String, String> roleParams = new HashMap<String, String>(); + Map<String, String> roleParams = new HashMap<>(); roleParams.put(ServerAction.ACTION_NAME, actionName); if (userName != null) { roleParams.put(ServerAction.ACTION_USER_NAME, userName); @@ -539,7 +539,7 @@ public class Stage { Assert.notEmpty(cancelTargets, "Provided targets task Id are empty."); - Map<String, String> roleParams = new HashMap<String, String>(); + Map<String, String> roleParams = new HashMap<>(); roleParams.put("cancelTaskIdTargets", StringUtils.join(cancelTargets, ',')); cmd.setRoleParams(roleParams); @@ -550,7 +550,7 @@ public class Stage { * @return list of hosts */ public synchronized List<String> getHosts() { // TODO: Check whether method should be synchronized - List<String> hlist = new ArrayList<String>(); + List<String> hlist = new ArrayList<>(); for (String h : hostRoleCommands.keySet()) { hlist.add(h); } http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java index d6d5a35..8d05e4d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ActionQueue.java @@ -40,14 +40,14 @@ public class ActionQueue { private static Logger LOG = LoggerFactory.getLogger(ActionQueue.class); - private static HashSet<String> EMPTY_HOST_LIST = new HashSet<String>(); + private static HashSet<String> EMPTY_HOST_LIST = new HashSet<>(); final ConcurrentMap<String, Queue<AgentCommand>> hostQueues; - HashSet<String> hostsWithPendingTask = new HashSet<String>(); + HashSet<String> hostsWithPendingTask = new HashSet<>(); public ActionQueue() { - hostQueues = new ConcurrentHashMap<String, Queue<AgentCommand>>(); + hostQueues = new ConcurrentHashMap<>(); } private Queue<AgentCommand> getQueue(String hostname) { @@ -138,8 +138,8 @@ public class ActionQueue { return null; } - List<AgentCommand> removedCommands = new ArrayList<AgentCommand>( - queue.size()); + List<AgentCommand> removedCommands = new ArrayList<>( + queue.size()); Iterator<AgentCommand> iterator = queue.iterator(); while (iterator.hasNext()) { @@ -196,7 +196,7 @@ public class ActionQueue { return null; } - List<AgentCommand> l = new ArrayList<AgentCommand>(); + List<AgentCommand> l = new ArrayList<>(); AgentCommand command; do { http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java index d0b7cc6..dc75512 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentRequests.java @@ -35,7 +35,7 @@ import com.google.inject.Singleton; @Singleton public class AgentRequests { private static Log LOG = LogFactory.getLog(HeartbeatMonitor.class); - private final Map<String, Map<String, Boolean>> requiresExecCmdDetails = new HashMap<String, Map<String, Boolean>>(); + private final Map<String, Map<String, Boolean>> requiresExecCmdDetails = new HashMap<>(); private final Object _lock = new Object(); /** http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java index edf1251..0d1ef13 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/ExecutionCommand.java @@ -67,7 +67,7 @@ public class ExecutionCommand extends AgentCommand { private String role; @SerializedName("hostLevelParams") - private Map<String, String> hostLevelParams = new HashMap<String, String>(); + private Map<String, String> hostLevelParams = new HashMap<>(); @SerializedName("roleParams") private Map<String, String> roleParams = null; @@ -77,7 +77,7 @@ public class ExecutionCommand extends AgentCommand { @SerializedName("clusterHostInfo") private Map<String, Set<String>> clusterHostInfo = - new HashMap<String, Set<String>>(); + new HashMap<>(); @SerializedName("configurations") private Map<String, Map<String, String>> configurations; @@ -92,7 +92,7 @@ public class ExecutionCommand extends AgentCommand { private boolean forceRefreshConfigTagsBeforeExecution = false; @SerializedName("commandParams") - private Map<String, String> commandParams = new HashMap<String, String>(); + private Map<String, String> commandParams = new HashMap<>(); @SerializedName("serviceName") private String serviceName; @@ -104,10 +104,10 @@ public class ExecutionCommand extends AgentCommand { private String componentName; @SerializedName("kerberosCommandParams") - private List<Map<String, String>> kerberosCommandParams = new ArrayList<Map<String, String>>(); + private List<Map<String, String>> kerberosCommandParams = new ArrayList<>(); @SerializedName("localComponents") - private Set<String> localComponents = new HashSet<String>(); + private Set<String> localComponents = new HashSet<>(); @SerializedName("availableServices") private Map<String, String> availableServices = new HashMap<>(); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java index 0323479..7d5f78c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeat.java @@ -35,9 +35,9 @@ public class HeartBeat { private long responseId = -1; private long timestamp; private String hostname; - List<CommandReport> reports = new ArrayList<CommandReport>(); - List<ComponentStatus> componentStatus = new ArrayList<ComponentStatus>(); - private List<DiskInfo> mounts = new ArrayList<DiskInfo>(); + List<CommandReport> reports = new ArrayList<>(); + List<ComponentStatus> componentStatus = new ArrayList<>(); + private List<DiskInfo> mounts = new ArrayList<>(); HostStatus nodeStatus; private AgentEnv agentEnv = null; private List<Alert> alerts = null; http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java index 7c833f6..3601528 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatHandler.java @@ -110,9 +110,9 @@ public class HeartBeatHandler { @Inject private KerberosIdentityDataFileReaderFactory kerberosIdentityDataFileReaderFactory; - private Map<String, Long> hostResponseIds = new ConcurrentHashMap<String, Long>(); + private Map<String, Long> hostResponseIds = new ConcurrentHashMap<>(); - private Map<String, HeartBeatResponse> hostResponses = new ConcurrentHashMap<String, HeartBeatResponse>(); + private Map<String, HeartBeatResponse> hostResponses = new ConcurrentHashMap<>(); @Inject public HeartBeatHandler(Clusters fsm, ActionQueue aq, ActionManager am, @@ -523,10 +523,10 @@ public class HeartBeatHandler { } private Map<String, Map<String, String>> getComponentsMap(StackInfo stack) { - Map<String, Map<String, String>> result = new HashMap<String, Map<String, String>>(); + Map<String, Map<String, String>> result = new HashMap<>(); for (ServiceInfo service : stack.getServices()) { - Map<String, String> components = new HashMap<String, String>(); + Map<String, String> components = new HashMap<>(); for (ComponentInfo component : service.getComponents()) { components.put(component.getName(), component.getCategory()); @@ -554,7 +554,7 @@ public class HeartBeatHandler { return null; } - List<AlertDefinitionCommand> commands = new ArrayList<AlertDefinitionCommand>(); + List<AlertDefinitionCommand> commands = new ArrayList<>(); // for every cluster this host is a member of, build the command for (Cluster cluster : hostClusters) { @@ -608,7 +608,7 @@ public class HeartBeatHandler { File keytabFile = new File(dataDir + File.separator + hostName + File.separator + sha1Keytab); if (keytabFile.canRead()) { - Map<String, String> keytabMap = new HashMap<String, String>(); + Map<String, String> keytabMap = new HashMap<>(); String principal = record.get(KerberosIdentityDataFileReader.PRINCIPAL); String isService = record.get(KerberosIdentityDataFileReader.SERVICE); @@ -636,7 +636,7 @@ public class HeartBeatHandler { } } } else if ("REMOVE_KEYTAB".equalsIgnoreCase(command)) { - Map<String, String> keytabMap = new HashMap<String, String>(); + Map<String, String> keytabMap = new HashMap<>(); keytabMap.put(KerberosIdentityDataFileReader.HOSTNAME, hostName); keytabMap.put(KerberosIdentityDataFileReader.SERVICE, record.get(KerberosIdentityDataFileReader.SERVICE)); http://git-wip-us.apache.org/repos/asf/ambari/blob/edbb5492/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java index 02970a1..43c484c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartBeatResponse.java @@ -32,13 +32,13 @@ public class HeartBeatResponse { private long responseId; @SerializedName("executionCommands") - private List<ExecutionCommand> executionCommands = new ArrayList<ExecutionCommand>(); + private List<ExecutionCommand> executionCommands = new ArrayList<>(); @SerializedName("statusCommands") - private List<StatusCommand> statusCommands = new ArrayList<StatusCommand>(); + private List<StatusCommand> statusCommands = new ArrayList<>(); @SerializedName("cancelCommands") - private List<CancelCommand> cancelCommands = new ArrayList<CancelCommand>(); + private List<CancelCommand> cancelCommands = new ArrayList<>(); /** * {@link AlertDefinitionCommand}s are used to isntruct the agent as to which @@ -197,7 +197,7 @@ public class HeartBeatResponse { // commands are added here when they are taken off the queue; there should // be no thread contention and thus no worry about locks for the null check if (null == alertDefinitionCommands) { - alertDefinitionCommands = new ArrayList<AlertDefinitionCommand>(); + alertDefinitionCommands = new ArrayList<>(); } alertDefinitionCommands.add(command); @@ -207,7 +207,7 @@ public class HeartBeatResponse { // commands are added here when they are taken off the queue; there should // be no thread contention and thus no worry about locks for the null check if (null == alertExecutionCommands) { - alertExecutionCommands = new ArrayList<AlertExecutionCommand>(); + alertExecutionCommands = new ArrayList<>(); } alertExecutionCommands.add(command);
