AMBARI-19149 - Clean up Ambari Server source code warnings (Attila Doroszlai via jonathanhurley)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4db5709 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4db5709 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4db5709 Branch: refs/heads/trunk Commit: e4db57093f4d17497366cdfbf02127f36399bf42 Parents: 66124ac Author: Jonathan Hurley <[email protected]> Authored: Mon Dec 12 12:24:40 2016 -0500 Committer: Jonathan Hurley <[email protected]> Committed: Mon Dec 12 12:24:40 2016 -0500 ---------------------------------------------------------------------- ambari-server/checkstyle.xml | 13 +++ .../persist/jpa/AmbariJpaPersistService.java | 4 +- .../ambari/server/StateRecoveryManager.java | 5 +- .../actionmanager/ExecutionCommandWrapper.java | 2 - .../server/actionmanager/RequestFactory.java | 5 +- .../ambari/server/actionmanager/Stage.java | 2 - .../apache/ambari/server/agent/AgentEnv.java | 2 - .../ambari/server/agent/AgentRequests.java | 7 +- .../ambari/server/agent/HeartBeatHandler.java | 42 -------- .../ambari/server/agent/HeartbeatProcessor.java | 2 - .../ambari/server/agent/RecoveryReport.java | 4 +- .../ambari/server/agent/StatusCommand.java | 7 +- .../ambari/server/agent/rest/AgentResource.java | 3 +- .../server/api/AmbariCsrfProtectionFilter.java | 16 +-- .../ambari/server/api/AmbariErrorHandler.java | 18 ++-- .../ambari/server/api/AmbariPersistFilter.java | 12 ++- .../ambari/server/api/GsonJsonProvider.java | 28 ++--- .../ambari/server/api/MethodOverrideFilter.java | 9 +- .../api/handlers/BaseManagementHandler.java | 13 ++- .../server/api/handlers/CreateHandler.java | 14 ++- .../server/api/handlers/DeleteHandler.java | 3 +- .../server/api/handlers/QueryCreateHandler.java | 24 ++++- .../ambari/server/api/handlers/ReadHandler.java | 8 +- .../server/api/handlers/UpdateHandler.java | 2 +- .../server/api/predicate/PredicateCompiler.java | 4 +- .../ambari/server/api/predicate/QueryLexer.java | 11 +- .../expressions/AbstractExpression.java | 4 +- .../api/predicate/expressions/Expression.java | 4 +- .../expressions/LogicalExpression.java | 6 +- .../expressions/NotLogicalExpression.java | 6 +- .../api/predicate/operators/InOperator.java | 6 +- .../query/ExtendedResourcePredicateVisitor.java | 10 +- .../api/query/ProcessingPredicateVisitor.java | 12 +-- .../apache/ambari/server/api/query/Query.java | 8 +- .../ambari/server/api/query/QueryInfo.java | 4 +- .../api/query/SubResourcePredicateVisitor.java | 8 +- .../server/api/query/render/BaseRenderer.java | 6 +- .../query/render/ClusterBlueprintRenderer.java | 20 ++-- .../api/query/render/DefaultRenderer.java | 3 +- .../render/HostKerberosIdentityCsvRenderer.java | 10 +- .../query/render/MetricsPaddingRenderer.java | 7 +- .../api/query/render/MinimalRenderer.java | 14 +-- .../server/api/query/render/Renderer.java | 4 +- .../ActiveWidgetLayoutResourceDefinition.java | 8 +- .../api/resources/BaseResourceDefinition.java | 18 ++-- .../resources/BlueprintResourceDefinition.java | 4 +- .../resources/ComponentResourceDefinition.java | 10 +- .../ConfigGroupResourceDefinition.java | 8 +- .../ConfigurationResourceDefinition.java | 2 +- .../resources/CredentialResourceDefinition.java | 2 - .../api/resources/FeedResourceDefinition.java | 4 +- .../HostComponentResourceDefinition.java | 12 ++- .../resources/InstanceResourceDefinition.java | 4 +- .../LdapSyncEventResourceDefinition.java | 4 +- .../resources/LoggingResourceDefinition.java | 3 - .../resources/PermissionResourceDefinition.java | 4 +- .../resources/PrivilegeResourceDefinition.java | 4 +- .../resources/RequestResourceDefinition.java | 6 +- .../RequestScheduleResourceDefinition.java | 5 +- .../api/resources/ResourceDefinition.java | 13 ++- .../server/api/resources/ResourceInstance.java | 4 +- .../api/resources/ResourceInstanceFactory.java | 4 +- ...tServiceHostComponentResourceDefinition.java | 2 +- .../resources/ServiceResourceDefinition.java | 5 +- .../api/resources/SimpleResourceDefinition.java | 4 +- .../StackConfigurationResourceDefinition.java | 6 +- ...StackServiceComponentResourceDefinition.java | 4 +- .../api/resources/SubResourceDefinition.java | 4 +- .../TargetClusterResourceDefinition.java | 4 +- .../resources/UpgradeResourceDefinition.java | 4 +- .../ViewExternalSubResourceDefinition.java | 4 +- .../ViewInstanceResourceDefinition.java | 4 +- .../ViewPermissionResourceDefinition.java | 4 +- .../api/resources/ViewResourceDefinition.java | 4 +- .../resources/ViewUrlResourceDefinition.java | 3 - .../ViewVersionResourceDefinition.java | 4 +- .../WidgetLayoutResourceDefinition.java | 13 +-- .../api/resources/WidgetResourceDefinition.java | 5 - .../server/api/services/ActionService.java | 7 +- .../api/services/ActiveWidgetLayoutService.java | 8 +- .../api/services/AmbariPrivilegeService.java | 7 +- .../ambari/server/api/services/BaseService.java | 19 ++-- .../server/api/services/BlueprintService.java | 7 +- .../ClusterKerberosDescriptorService.java | 9 +- .../api/services/ClusterPrivilegeService.java | 6 +- .../server/api/services/ConfigGroupService.java | 9 +- .../api/services/ConfigurationService.java | 6 +- .../server/api/services/CredentialService.java | 9 +- .../server/api/services/DeleteRequest.java | 6 +- .../api/services/DeleteResultMetadata.java | 14 ++- .../ambari/server/api/services/FeedService.java | 7 +- .../ambari/server/api/services/GetRequest.java | 6 +- .../api/services/GroupPrivilegeService.java | 9 +- .../server/api/services/GroupService.java | 4 +- .../services/HostKerberosIdentityService.java | 9 +- .../server/api/services/InstanceService.java | 6 +- .../api/services/KerberosDescriptorService.java | 7 +- .../ambari/server/api/services/KeyService.java | 14 +-- .../api/services/LdapSyncEventService.java | 7 +- .../server/api/services/LoggingService.java | 31 +++--- .../server/api/services/LogoutService.java | 2 +- .../server/api/services/PermissionService.java | 7 +- .../api/services/PersistKeyValueImpl.java | 18 ++-- .../ambari/server/api/services/PostRequest.java | 6 +- .../server/api/services/PrivilegeService.java | 4 +- .../ambari/server/api/services/PutRequest.java | 6 +- .../server/api/services/QueryPostRequest.java | 6 +- .../api/services/RemoteClustersService.java | 9 +- .../ambari/server/api/services/Request.java | 8 +- .../server/api/services/RequestFactory.java | 11 +- .../api/services/RequestScheduleService.java | 10 +- .../server/api/services/RequestService.java | 9 +- .../ambari/server/api/services/Result.java | 2 +- .../ambari/server/api/services/ResultImpl.java | 2 +- .../api/services/ResultPostProcessorImpl.java | 12 +-- .../api/services/RoleAuthorizationService.java | 9 +- .../services/ServiceConfigVersionService.java | 9 +- .../server/api/services/SettingService.java | 8 +- .../server/api/services/StageService.java | 9 +- .../api/services/TargetClusterService.java | 7 +- .../ambari/server/api/services/TaskService.java | 9 +- .../api/services/UpgradeSummaryService.java | 9 +- .../api/services/UserAuthorizationService.java | 8 +- .../api/services/UserPrivilegeService.java | 5 +- .../ambari/server/api/services/UserService.java | 6 +- .../api/services/ViewDataMigrationService.java | 12 +-- .../ViewExternalSubResourceService.java | 15 +-- .../api/services/ViewInstanceService.java | 15 +-- .../api/services/ViewPermissionService.java | 9 +- .../api/services/ViewPrivilegeService.java | 6 +- .../ambari/server/api/services/ViewService.java | 7 +- .../api/services/ViewSubResourceService.java | 13 +-- .../server/api/services/ViewUrlsService.java | 12 ++- .../server/api/services/ViewVersionService.java | 9 +- .../api/services/WidgetLayoutService.java | 20 ++-- .../server/api/services/WidgetService.java | 21 ++-- .../api/services/parsers/RequestBodyParser.java | 4 +- .../persistence/PersistenceManagerImpl.java | 10 +- .../api/services/serializers/CsvSerializer.java | 17 ++- .../services/serializers/JsonSerializer.java | 16 +-- .../services/serializers/ResultSerializer.java | 2 +- .../StackAdvisorBlueprintProcessor.java | 17 ++- .../stackadvisor/StackAdvisorRequest.java | 1 - ...rationDependenciesRecommendationCommand.java | 14 +-- .../ConfigurationRecommendationCommand.java | 14 +-- .../commands/StackAdvisorCommand.java | 4 - .../ambari/server/audit/AuditLoggerModule.java | 2 +- .../eventcreator/AlertTargetEventCreator.java | 2 - .../eventcreator/RequestEventCreator.java | 5 +- .../ambari/server/bootstrap/BSRunner.java | 5 +- .../ambari/server/bootstrap/BootStrapImpl.java | 1 - .../server/checks/AbstractCheckDescriptor.java | 3 +- .../checks/ComponentsInstallationCheck.java | 1 - .../server/checks/ConfigurationMergeCheck.java | 1 - .../HardcodedStackVersionPropertiesCheck.java | 27 ++--- .../HiveDynamicServiceDiscoveryCheck.java | 2 - ...apReduce2JobHistoryStatePreservingCheck.java | 14 +-- .../server/checks/MpackInstallChecker.java | 24 ++--- .../server/checks/PreviousUpgradeCompleted.java | 24 ++--- .../checks/SecondaryNamenodeDeletedCheck.java | 1 - .../ServicesMapReduceDistributedCacheCheck.java | 1 - .../ServicesNamenodeHighAvailabilityCheck.java | 1 - .../checks/ServicesNamenodeTruncateCheck.java | 5 +- .../ServicesTezDistributedCacheCheck.java | 1 - .../checks/ServicesYarnWorkPreservingCheck.java | 6 +- .../server/checks/StormRestAPIDeletedCheck.java | 13 +-- .../server/checks/UpgradeCheckRegistry.java | 4 +- .../server/checks/VersionMismatchCheck.java | 9 +- .../checks/YarnRMHighAvailabilityCheck.java | 3 - .../YarnTimelineServerStatePreservingCheck.java | 1 - .../ambari/server/collections/Predicate.java | 4 +- .../server/collections/PredicateUtils.java | 11 +- .../collections/functors/AndPredicate.java | 8 +- .../collections/functors/ContainsPredicate.java | 4 +- .../functors/ContextTransformer.java | 4 +- .../DelegatedMultiplePredicateContainer.java | 6 +- .../DelegatedSinglePredicateContainer.java | 6 +- .../collections/functors/EqualsPredicate.java | 6 +- .../collections/functors/NotPredicate.java | 4 +- .../collections/functors/OrPredicate.java | 8 +- .../functors/PredicateClassFactory.java | 4 +- .../server/configuration/Configuration.java | 77 +++++++------- .../server/controller/AmbariHandlerList.java | 29 +++--- .../ambari/server/controller/AmbariServer.java | 8 +- .../server/controller/AmbariSessionManager.java | 8 +- .../server/controller/AuthToLocalBuilder.java | 4 +- .../server/controller/ClusterResponse.java | 4 +- .../server/controller/ConfigGroupRequest.java | 5 +- .../server/controller/ControllerModule.java | 31 +++--- .../server/controller/ExecuteActionRequest.java | 6 +- .../controller/ExtensionVersionResponse.java | 3 - .../server/controller/KerberosHelper.java | 12 +-- .../server/controller/KerberosHelperImpl.java | 3 +- .../server/controller/LdapSyncRequest.java | 4 +- .../controller/ResourceProviderFactory.java | 1 - .../controller/RootServiceResponseFactory.java | 4 +- .../ServiceConfigVersionResponse.java | 1 - .../StackLevelConfigurationResponse.java | 1 - .../StackServiceComponentResponse.java | 8 +- .../server/controller/StackServiceResponse.java | 6 +- .../server/controller/StackVersionResponse.java | 1 + .../ambari/server/controller/UserResponse.java | 4 +- .../GSInstallerComponentProvider.java | 4 +- .../GSInstallerHostComponentProvider.java | 4 +- .../gsinstaller/GSInstallerHostProvider.java | 4 +- .../gsinstaller/GSInstallerNoOpProvider.java | 8 +- .../gsinstaller/GSInstallerProviderModule.java | 8 +- .../GSInstallerResourceProvider.java | 8 +- .../gsinstaller/GSInstallerServiceProvider.java | 4 +- .../AbstractAuthorizedResourceProvider.java | 12 +-- .../internal/AbstractDRResourceProvider.java | 6 +- .../internal/AbstractPropertyProvider.java | 28 ++--- .../internal/AbstractResourceProvider.java | 14 ++- .../internal/ActionResourceProvider.java | 12 +-- .../ActiveWidgetLayoutResourceProvider.java | 19 ++-- .../internal/AlertHistoryResourceProvider.java | 2 +- .../internal/AlertNoticeResourceProvider.java | 2 +- .../internal/AlertResourceProviderUtils.java | 6 +- .../AmbariPrivilegeResourceProvider.java | 24 ++--- .../internal/ArtifactResourceProvider.java | 23 ++-- .../AtlasServerHttpPropertyRequest.java | 6 +- .../controller/internal/BaseClusterRequest.java | 10 +- .../internal/BlueprintResourceProvider.java | 33 +++--- ...usterKerberosDescriptorResourceProvider.java | 18 ++-- .../ClusterPrivilegeResourceProvider.java | 18 ++-- .../internal/CredentialResourceProvider.java | 19 ++-- .../DefaultResourcePredicateEvaluator.java | 2 +- .../internal/DeleteStatusMetaData.java | 9 +- .../internal/ExportBlueprintRequest.java | 22 ++-- .../server/controller/internal/Extension.java | 2 - .../internal/ExtensionLinkResourceProvider.java | 10 +- .../internal/ExtensionResourceProvider.java | 17 ++- .../ExtensionVersionResourceProvider.java | 4 - .../internal/FeedResourceProvider.java | 16 +-- .../GroupPrivilegeResourceProvider.java | 21 ++-- .../HostComponentProcessResourceProvider.java | 3 - .../HostKerberosIdentityResourceProvider.java | 21 ++-- .../internal/HostResourceProvider.java | 3 - .../controller/internal/HostStatusHelper.java | 6 +- .../internal/HttpPropertyProvider.java | 18 ++-- .../internal/InstanceResourceProvider.java | 16 +-- .../internal/JsonHttpPropertyRequest.java | 13 +-- .../KerberosDescriptorResourceProvider.java | 16 +-- .../internal/LdapSyncEventResourceProvider.java | 37 +++---- .../internal/LoggingResourceProvider.java | 18 ++-- .../internal/PermissionResourceProvider.java | 10 +- .../PreUpgradeCheckResourceProvider.java | 1 - .../internal/PropertyPredicateVisitor.java | 8 +- .../PropertyValueTrimmingStrategyDefiner.java | 4 +- .../controller/internal/QueryResponseImpl.java | 4 +- .../QuickLinkArtifactResourceProvider.java | 16 +-- .../internal/RemoteClusterResourceProvider.java | 21 ++-- .../server/controller/internal/RequestImpl.java | 5 +- .../internal/RequestOperationLevel.java | 4 +- .../internal/RequestResourceFilter.java | 6 +- .../RequestScheduleResourceProvider.java | 16 +-- .../internal/RequestStageContainer.java | 10 +- .../controller/internal/RequestStatusImpl.java | 6 +- .../controller/internal/ResourceImpl.java | 9 +- .../ResourceManagerHttpPropertyRequest.java | 6 +- .../RoleAuthorizationResourceProvider.java | 22 ++-- .../RootServiceComponentPropertyProvider.java | 21 ++-- .../RootServiceComponentResourceProvider.java | 1 + ...ootServiceHostComponentResourceProvider.java | 2 +- .../internal/RootServiceResourceProvider.java | 2 +- .../internal/SettingResourceProvider.java | 19 ++-- .../internal/SimplifyingPredicateVisitor.java | 10 +- .../controller/internal/SortRequestImpl.java | 5 +- .../internal/StackAdvisorResourceProvider.java | 3 +- .../internal/StackArtifactResourceProvider.java | 31 +++--- ...ConfigurationDependencyResourceProvider.java | 12 +-- .../StackDependencyResourceProvider.java | 16 +-- ...StackLevelConfigurationResourceProvider.java | 12 +-- .../internal/StackResourceProvider.java | 15 ++- .../StackServiceComponentResourceProvider.java | 16 ++- .../internal/StackServiceResourceProvider.java | 13 +-- .../internal/StackVersionResourceProvider.java | 3 +- .../internal/TargetClusterResourceProvider.java | 16 +-- .../internal/TaskResourceProvider.java | 2 +- .../controller/internal/TemporalInfoImpl.java | 4 +- .../internal/ThemeArtifactResourceProvider.java | 16 +-- .../internal/UpgradeItemResourceProvider.java | 4 +- .../UpgradeSummaryResourceProvider.java | 17 +-- .../UserAuthorizationResourceProvider.java | 15 +-- .../internal/UserPrivilegeResourceProvider.java | 23 ++-- .../internal/UserResourceProvider.java | 23 ++-- .../internal/ValidationResourceProvider.java | 4 - .../VersionDefinitionResourceProvider.java | 2 +- .../internal/ViewInstanceResourceProvider.java | 18 ++-- .../internal/ViewResourceProvider.java | 14 +-- .../internal/ViewURLResourceProvider.java | 23 ++-- .../internal/ViewVersionResourceProvider.java | 12 +-- .../internal/WidgetLayoutResourceProvider.java | 23 ++-- .../internal/WidgetResourceProvider.java | 17 +-- .../controller/jdbc/JDBCResourceProvider.java | 31 ++++-- .../server/controller/jmx/JMXHostProvider.java | 4 +- .../logging/HostComponentLoggingInfo.java | 4 +- .../logging/LogLevelQueryResponse.java | 4 +- .../controller/logging/LogLineResult.java | 6 +- .../controller/logging/LogQueryResponse.java | 6 +- .../logging/LogSearchDataRetrievalService.java | 19 ++-- .../LoggingRequestHelperFactoryImpl.java | 4 +- .../logging/LoggingRequestHelperImpl.java | 46 ++++---- .../logging/LoggingSearchPropertyProvider.java | 19 ++-- .../ambari/server/controller/logging/Utils.java | 4 +- .../controller/metrics/MetricHostProvider.java | 4 +- .../metrics/MetricsCollectorHAClusterState.java | 14 +-- .../metrics/MetricsCollectorHAManager.java | 9 +- .../MetricsDataTransferMethodFactory.java | 5 +- .../MetricsDownsamplingMethodFactory.java | 9 +- .../metrics/MetricsPaddingMethod.java | 8 +- .../metrics/MetricsPropertyProvider.java | 11 +- .../metrics/MetricsPropertyProviderProxy.java | 16 +-- .../metrics/MetricsReportPropertyProvider.java | 3 +- .../MetricsReportPropertyProviderProxy.java | 14 +-- .../GangliaComponentPropertyProvider.java | 2 - .../GangliaHostComponentPropertyProvider.java | 1 - .../ganglia/GangliaHostPropertyProvider.java | 8 +- .../metrics/ganglia/GangliaMetric.java | 1 + .../ganglia/GangliaPropertyProvider.java | 30 +++--- .../ganglia/GangliaReportPropertyProvider.java | 16 +-- .../timeline/AMSComponentPropertyProvider.java | 5 +- .../AMSHostComponentPropertyProvider.java | 4 +- .../timeline/AMSHostPropertyProvider.java | 5 +- .../metrics/timeline/AMSPropertyProvider.java | 50 ++++----- .../timeline/AMSReportPropertyProvider.java | 26 +++-- .../metrics/timeline/MetricsRequestHelper.java | 33 +++--- .../cache/TimelineAppMetricCacheKey.java | 5 +- .../timeline/cache/TimelineMetricCache.java | 20 ++-- .../cache/TimelineMetricCacheEntryFactory.java | 21 ++-- .../cache/TimelineMetricCacheProvider.java | 13 +-- .../cache/TimelineMetricsCacheSizeOfEngine.java | 14 +-- .../cache/TimelineMetricsCacheValue.java | 5 +- .../controller/predicate/AlwaysPredicate.java | 4 +- .../controller/predicate/AndPredicate.java | 6 +- .../controller/predicate/ArrayPredicate.java | 6 +- .../controller/predicate/BasePredicate.java | 4 +- .../predicate/CategoryIsEmptyPredicate.java | 4 +- .../controller/predicate/FilterPredicate.java | 3 +- .../controller/predicate/OrPredicate.java | 6 +- .../controller/predicate/UnaryPredicate.java | 4 +- .../ambari/server/controller/spi/Resource.java | 4 - .../server/controller/spi/SortRequest.java | 2 - .../utilities/ClusterControllerHelper.java | 2 +- .../controller/utilities/KerberosChecker.java | 16 +-- .../controller/utilities/PredicateBuilder.java | 6 +- .../controller/utilities/PredicateHelper.java | 8 +- .../controller/utilities/PropertyHelper.java | 3 - .../ServiceCalculatedStateFactory.java | 6 +- .../state/DefaultServiceCalculatedState.java | 9 +- .../state/FlumeServiceCalculatedState.java | 6 +- .../state/HBaseServiceCalculatedState.java | 6 +- .../state/HDFSServiceCalculatedState.java | 6 +- .../state/HiveServiceCalculatedState.java | 6 +- .../state/OozieServiceCalculatedState.java | 6 +- .../state/YARNServiceCalculatedState.java | 6 +- .../server/customactions/ActionDefinition.java | 4 +- .../customactions/ActionDefinitionManager.java | 27 ++--- .../apache/ambari/server/events/AlertEvent.java | 4 +- .../events/publishers/AlertEventPublisher.java | 2 +- .../publishers/VersionEventPublisher.java | 4 +- .../server/hooks/users/UserCreatedEvent.java | 2 - .../ambari/server/logging/LockFactory.java | 15 +-- .../server/logging/LockProfileDelegate.java | 9 +- .../server/logging/ProfiledReentrantLock.java | 4 +- .../logging/ProfiledReentrantReadWriteLock.java | 4 +- .../ambari/server/metadata/ActionMetadata.java | 9 +- .../system/impl/AbstractMetricsSource.java | 4 +- .../system/impl/AmbariMetricSinkImpl.java | 15 +-- .../metrics/system/impl/Configuration.java | 6 +- .../metrics/system/impl/JvmMetricsSource.java | 15 +-- .../metrics/system/impl/MetricsServiceImpl.java | 26 ++--- .../dispatchers/AmbariSNMPDispatcher.java | 9 +- .../dispatchers/SNMPDispatcher.java | 2 +- .../orm/AmbariLocalSessionInterceptor.java | 5 +- .../ambari/server/orm/dao/ArtifactDAO.java | 18 ++-- .../ambari/server/orm/dao/BlueprintDAO.java | 16 +-- .../ambari/server/orm/dao/ClusterStateDAO.java | 12 ++- .../orm/dao/ConfigGroupConfigMappingDAO.java | 15 +-- .../ambari/server/orm/dao/ConfigGroupDAO.java | 15 +-- .../apache/ambari/server/orm/dao/CrudDAO.java | 1 + .../apache/ambari/server/orm/dao/DaoUtils.java | 14 ++- .../server/orm/dao/ExecutionCommandDAO.java | 12 ++- .../ambari/server/orm/dao/ExtensionLinkDAO.java | 2 - .../server/orm/dao/HostConfigMappingDAO.java | 4 +- .../ambari/server/orm/dao/HostStateDAO.java | 14 +-- .../server/orm/dao/KerberosDescriptorDAO.java | 10 +- .../server/orm/dao/KerberosPrincipalDAO.java | 14 +-- .../orm/dao/KerberosPrincipalHostDAO.java | 16 +-- .../ambari/server/orm/dao/KeyValueDAO.java | 14 +-- .../ambari/server/orm/dao/MetainfoDAO.java | 14 +-- .../ambari/server/orm/dao/PrincipalDAO.java | 1 + .../ambari/server/orm/dao/PrincipalTypeDAO.java | 15 +-- .../ambari/server/orm/dao/PrivilegeDAO.java | 2 +- .../server/orm/dao/RemoteAmbariClusterDAO.java | 16 +-- .../orm/dao/RequestOperationLevelDAO.java | 16 +-- .../orm/dao/RequestScheduleBatchRequestDAO.java | 17 +-- .../server/orm/dao/RequestScheduleDAO.java | 15 +-- .../ambari/server/orm/dao/ResourceDAO.java | 16 +-- .../ambari/server/orm/dao/ResourceTypeDAO.java | 14 +-- .../server/orm/dao/RoleAuthorizationDAO.java | 14 +-- .../server/orm/dao/RoleSuccessCriteriaDAO.java | 14 +-- .../server/orm/dao/ServiceDesiredStateDAO.java | 18 ++-- .../ambari/server/orm/dao/SettingDAO.java | 16 +-- .../server/orm/dao/TopologyHostGroupDAO.java | 14 +-- .../server/orm/dao/TopologyHostRequestDAO.java | 12 ++- .../server/orm/dao/TopologyHostTaskDAO.java | 16 +-- .../orm/dao/TopologyLogicalRequestDAO.java | 11 +- .../server/orm/dao/TopologyLogicalTaskDAO.java | 12 ++- .../server/orm/dao/TopologyRequestDAO.java | 13 ++- .../apache/ambari/server/orm/dao/UserDAO.java | 4 +- .../apache/ambari/server/orm/dao/ViewDAO.java | 14 +-- .../ambari/server/orm/dao/ViewURLDAO.java | 17 ++- .../apache/ambari/server/orm/dao/WidgetDAO.java | 14 +-- .../ambari/server/orm/dao/WidgetLayoutDAO.java | 17 ++- .../server/orm/entities/ArtifactEntity.java | 9 +- .../server/orm/entities/BlueprintEntity.java | 5 +- .../orm/entities/ClusterConfigEntity.java | 4 +- .../orm/entities/ClusterServiceEntity.java | 13 ++- .../orm/entities/ClusterServiceEntityPK.java | 3 +- .../ConfigGroupConfigMappingEntityPK.java | 3 +- .../server/orm/entities/ConfigGroupEntity.java | 3 +- .../ConfigGroupHostMappingEntityPK.java | 3 +- .../orm/entities/ExecutionCommandEntity.java | 10 +- .../HostComponentDesiredStateEntityPK.java | 3 +- .../orm/entities/HostConfigMappingEntityPK.java | 3 +- .../server/orm/entities/HostGroupEntity.java | 3 +- .../orm/entities/KerberosPrincipalEntity.java | 3 +- .../entities/KerberosPrincipalHostEntityPK.java | 3 +- .../server/orm/entities/KeyValueEntity.java | 6 +- .../server/orm/entities/MetainfoEntity.java | 7 +- .../server/orm/entities/PermissionEntity.java | 3 +- .../orm/entities/PrincipalTypeEntity.java | 10 +- .../orm/entities/RemoteAmbariClusterEntity.java | 13 +-- .../orm/entities/RepositoryVersionEntity.java | 6 +- .../server/orm/entities/RequestEntity.java | 7 +- .../entities/RequestOperationLevelEntity.java | 2 - .../RequestScheduleBatchRequestEntityPK.java | 3 +- .../orm/entities/RequestScheduleEntity.java | 5 +- .../server/orm/entities/ResourceEntity.java | 14 ++- .../server/orm/entities/ResourceTypeEntity.java | 8 +- .../orm/entities/ServiceConfigEntity.java | 1 - .../entities/ServiceDesiredStateEntityPK.java | 3 +- .../server/orm/entities/SettingEntity.java | 3 +- .../server/orm/entities/StageEntityPK.java | 3 +- .../server/orm/entities/StageEntity_.java | 9 +- .../orm/entities/TopologyHostGroupEntity.java | 3 +- .../orm/entities/TopologyHostRequestEntity.java | 6 +- .../orm/entities/TopologyHostTaskEntity.java | 4 +- .../entities/TopologyLogicalRequestEntity.java | 7 +- .../orm/entities/TopologyRequestEntity.java | 3 +- .../ambari/server/orm/entities/UserEntity.java | 27 ++++- .../ambari/server/orm/entities/ViewEntity.java | 30 +++--- .../server/orm/entities/ViewInstanceEntity.java | 15 ++- .../server/orm/entities/ViewResourceEntity.java | 5 +- .../server/orm/entities/ViewURLEntity.java | 5 - .../server/orm/entities/WidgetEntity.java | 3 +- .../server/orm/entities/WidgetLayoutEntity.java | 3 +- .../WidgetLayoutUserWidgetEntityPK.java | 3 +- .../ambari/server/orm/helpers/ScriptRunner.java | 12 ++- .../server/orm/helpers/dbms/MySqlHelper.java | 8 +- .../ambari/server/proxy/ProxyService.java | 39 +++---- .../scheduler/AbstractLinearExecutionJob.java | 14 ++- .../scheduler/ExecutionScheduleManager.java | 67 ++++++------ .../server/scheduler/ExecutionScheduler.java | 8 +- .../server/security/AmbariEntryPoint.java | 7 +- .../server/security/SecurePasswordHelper.java | 4 +- .../ambari/server/security/SecurityHelper.java | 4 +- .../server/security/SecurityHelperImpl.java | 6 +- .../AmbariBasicAuthenticationFilter.java | 3 +- .../AmbariDelegatingAuthenticationFilter.java | 11 +- .../AmbariJWTAuthenticationFilter.java | 17 +-- .../AmbariAuthToLocalUserDetailsService.java | 10 +- .../AmbariKerberosAuthenticationFilter.java | 17 +-- .../AmbariKerberosAuthenticationProperties.java | 4 +- .../authorization/AmbariAuthentication.java | 2 +- .../AmbariAuthorizationFilter.java | 29 +++--- .../AmbariLdapAuthenticationProvider.java | 3 +- .../security/authorization/AmbariLdapUtils.java | 8 +- .../authorization/AmbariLocalUserProvider.java | 8 +- .../authorization/AmbariUserAuthentication.java | 4 +- .../AmbariUserAuthorizationFilter.java | 18 ++-- .../authorization/AuthorizationHelper.java | 19 ++-- .../authorization/LdapServerProperties.java | 4 +- .../server/security/authorization/User.java | 1 - .../AmbariInternalAuthenticationProvider.java | 3 +- .../internal/InternalAuthenticationToken.java | 2 +- .../internal/InternalTokenStorage.java | 6 +- .../authorization/jwt/JwtAuthentication.java | 4 +- .../jwt/JwtAuthenticationFilter.java | 36 ++++--- .../jwt/JwtAuthenticationProperties.java | 4 +- .../credential/PrincipalKeyCredential.java | 4 +- .../security/encryption/AESEncryptor.java | 1 + .../encryption/AbstractCredentialStore.java | 11 +- .../security/encryption/CertificateUtils.java | 8 +- .../security/encryption/CredentialProvider.java | 14 +-- .../security/encryption/CredentialStore.java | 4 +- .../encryption/CredentialStoreService.java | 4 +- .../encryption/CredentialStoreServiceImpl.java | 15 +-- .../encryption/FileBasedCredentialStore.java | 12 +-- .../encryption/InMemoryCredentialStore.java | 15 +-- .../security/ldap/AmbariLdapDataPopulator.java | 5 +- .../serveraction/AbstractServerAction.java | 9 +- .../ambari/server/serveraction/ActionLog.java | 4 +- .../server/serveraction/ServerAction.java | 4 +- .../serveraction/ServerActionExecutor.java | 2 +- .../kerberos/ADKerberosOperationHandler.java | 40 +++---- .../AbstractKerberosDataFileReader.java | 8 +- .../AbstractKerberosDataFileWriter.java | 6 +- .../AbstractPrepareKerberosServerAction.java | 25 ++--- .../kerberos/CleanupServerAction.java | 12 ++- .../ConfigureAmbariIdentitiesServerAction.java | 3 +- .../kerberos/CreateKeytabFilesServerAction.java | 17 +-- .../kerberos/CreatePrincipalsServerAction.java | 11 +- .../kerberos/DeconstructedPrincipal.java | 3 +- .../kerberos/DestroyPrincipalsServerAction.java | 13 +-- .../kerberos/FinalizeKerberosServerAction.java | 16 +-- .../kerberos/IPAKerberosOperationHandler.java | 16 +-- .../KerberosConfigDataFileReaderFactory.java | 4 +- .../KerberosConfigDataFileWriterFactory.java | 4 +- .../KerberosIdentityDataFileReaderFactory.java | 4 +- .../KerberosIdentityDataFileWriterFactory.java | 4 +- .../kerberos/KerberosOperationHandler.java | 28 ++--- .../kerberos/KerberosServerAction.java | 15 +-- .../kerberos/MITKerberosOperationHandler.java | 19 ++-- .../PrepareDisableKerberosServerAction.java | 23 ++-- .../PrepareEnableKerberosServerAction.java | 14 +-- .../PrepareKerberosIdentitiesServerAction.java | 21 ++-- .../kerberos/TrustingSSLSocketFactory.java | 11 +- .../UpdateKerberosConfigsServerAction.java | 19 ++-- .../upgrades/FinalizeUpgradeAction.java | 1 - .../upgrades/RangerWebAlertConfigAction.java | 13 +-- .../upgrades/UpdateDesiredStackAction.java | 5 +- .../upgrades/UpgradeUserKerberosDescriptor.java | 11 +- .../users/PostUserCreationHookServerAction.java | 3 - .../users/ShellCommandUtilityCallable.java | 1 - .../apache/ambari/server/stack/BaseModule.java | 4 +- .../server/stack/CommonServiceDirectory.java | 4 +- .../ambari/server/stack/ComponentModule.java | 12 +-- .../server/stack/ConfigurationDirectory.java | 23 ++-- .../ambari/server/stack/ExtensionModule.java | 5 - .../stack/QuickLinksConfigurationModule.java | 14 +-- .../ambari/server/stack/ServiceModule.java | 32 +++--- .../ambari/server/stack/StackContext.java | 14 +-- .../server/stack/StackDefinitionModule.java | 4 +- .../ambari/server/stack/StackManager.java | 2 +- .../server/stack/StackServiceDirectory.java | 1 + .../apache/ambari/server/stack/ThemeModule.java | 14 +-- .../stack/UpdateActiveRepoVersionOnStartup.java | 1 + .../ambari/server/stageplanner/RoleGraph.java | 17 ++- .../server/state/BulkCommandDefinition.java | 5 +- .../state/ClientConfigFileDefinition.java | 6 +- .../server/state/CommandScriptDefinition.java | 6 +- .../ambari/server/state/ComponentInfo.java | 6 +- .../ambari/server/state/ConfigHelper.java | 2 +- .../server/state/CustomCommandDefinition.java | 5 +- .../server/state/DependencyConditionInfo.java | 1 + .../ambari/server/state/DependencyInfo.java | 2 + .../ambari/server/state/ExtensionInfo.java | 1 - .../state/QuickLinksConfigurationInfo.java | 4 +- .../ambari/server/state/RepositoryInfo.java | 2 +- .../server/state/ServiceComponentHostEvent.java | 16 ++- .../apache/ambari/server/state/ServiceInfo.java | 42 ++++---- .../ambari/server/state/ServiceOsSpecific.java | 7 +- .../server/state/ServicePropertyInfo.java | 6 +- .../apache/ambari/server/state/StackInfo.java | 2 - .../apache/ambari/server/state/ThemeInfo.java | 5 +- .../server/state/ValueAttributesInfo.java | 7 +- .../ambari/server/state/ValueEntryInfo.java | 4 +- .../server/state/alert/AlertDefinitionHash.java | 1 - .../ambari/server/state/alert/AmsSource.java | 4 +- .../state/host/HostHealthyHeartbeatEvent.java | 6 +- .../AbstractKerberosDescriptorContainer.java | 6 +- .../AbstractKerberosDescriptorFactory.java | 11 +- .../KerberosConfigurationDescriptor.java | 2 +- .../state/kerberos/KerberosDescriptor.java | 2 +- .../kerberos/KerberosDescriptorFactory.java | 7 +- .../KerberosDescriptorUpdateHelper.java | 8 +- .../kerberos/KerberosIdentityDescriptor.java | 4 +- .../kerberos/KerberosPrincipalDescriptor.java | 2 +- .../kerberos/KerberosServiceDescriptor.java | 2 +- .../KerberosServiceDescriptorFactory.java | 7 +- .../kerberos/VariableReplacementHelper.java | 6 +- .../ambari/server/state/quicklinks/Link.java | 1 - .../server/state/quicklinks/Protocol.java | 4 +- .../quicklinks/QuickLinksConfiguration.java | 8 +- .../ambari/server/state/scheduler/Batch.java | 6 +- .../server/state/scheduler/BatchRequestJob.java | 10 +- .../server/state/scheduler/GuiceJobFactory.java | 5 +- .../scheduler/RequestExecutionFactory.java | 3 +- .../state/scheduler/RequestExecutionImpl.java | 26 ++--- .../server/state/stack/ConfigUpgradePack.java | 17 ++- .../server/state/stack/ConfigurationXml.java | 2 +- .../server/state/stack/MetricDefinition.java | 6 +- .../server/state/stack/ServiceMetainfoXml.java | 13 ++- .../server/state/stack/StackMetainfoXml.java | 2 + .../state/stack/StackRoleCommandOrder.java | 6 +- .../ambari/server/state/stack/WidgetLayout.java | 6 +- .../server/state/stack/WidgetLayoutInfo.java | 7 +- .../stack/upgrade/ConfigurationCondition.java | 1 - .../state/stack/upgrade/RestartGrouping.java | 5 +- .../state/stack/upgrade/StageWrapper.java | 4 +- .../state/stack/upgrade/StartGrouping.java | 5 +- .../state/stack/upgrade/StopGrouping.java | 5 +- .../ServiceComponentHostSummary.java | 8 +- .../server/state/theme/ConfigCondition.java | 4 +- .../server/state/theme/ConfigPlacement.java | 4 +- .../ambari/server/state/theme/Layout.java | 9 +- .../ambari/server/state/theme/Placement.java | 8 +- .../ambari/server/state/theme/Section.java | 8 +- .../ambari/server/state/theme/Subsection.java | 4 +- .../ambari/server/state/theme/TabLayout.java | 9 +- .../server/state/theme/ThemeConfiguration.java | 8 +- .../ambari/server/state/theme/Widget.java | 6 +- .../server/topology/AdvisedConfiguration.java | 1 + .../ambari/server/topology/Blueprint.java | 6 +- .../server/topology/BlueprintFactory.java | 15 +-- .../ambari/server/topology/BlueprintImpl.java | 15 +-- .../topology/ClusterConfigurationRequest.java | 22 ++-- .../ambari/server/topology/ClusterTopology.java | 6 +- .../server/topology/ClusterTopologyImpl.java | 6 +- .../ambari/server/topology/HostGroup.java | 9 +- .../ambari/server/topology/HostGroupImpl.java | 15 +-- .../server/topology/HostOfferResponse.java | 6 +- .../ambari/server/topology/PersistedState.java | 1 - .../server/topology/PersistedStateImpl.java | 21 ++-- .../topology/RequiredPasswordValidator.java | 6 +- .../topology/SecurityConfigurationFactory.java | 13 +-- .../apache/ambari/server/topology/Setting.java | 1 - .../ambari/server/topology/SettingFactory.java | 4 +- .../server/topology/TopologyRequestFactory.java | 4 +- .../topology/TopologyRequestFactoryImpl.java | 4 +- .../server/upgrade/AbstractUpgradeCatalog.java | 10 +- .../server/upgrade/FinalUpgradeCatalog.java | 17 +-- .../server/upgrade/SchemaUpgradeHelper.java | 2 +- .../server/upgrade/StackUpgradeHelper.java | 2 - .../server/upgrade/UpgradeCatalog212.java | 23 ++-- .../server/upgrade/UpgradeCatalog2121.java | 18 ++-- .../server/upgrade/UpgradeCatalog221.java | 31 +++--- .../server/upgrade/UpgradeCatalog240.java | 58 ++++++----- .../server/upgrade/UpgradeCatalog2402.java | 104 ++----------------- .../server/upgrade/UpgradeCatalog250.java | 19 ++-- .../ambari/server/utils/CommandUtils.java | 1 - .../apache/ambari/server/utils/JsonUtils.java | 3 +- .../ambari/server/utils/RequestUtils.java | 5 +- .../ambari/server/utils/SecretReference.java | 13 +-- .../apache/ambari/server/utils/SetUtils.java | 2 +- .../ambari/server/utils/ShellCommandUtil.java | 8 +- .../apache/ambari/server/utils/XmlUtils.java | 5 +- .../view/AmbariViewsMDCLoggingFilter.java | 12 ++- .../apache/ambari/server/view/ClusterImpl.java | 7 +- .../server/view/HttpImpersonatorImpl.java | 14 +-- .../server/view/ImpersonatorSettingImpl.java | 2 +- .../ambari/server/view/RemoteAmbariCluster.java | 25 ++--- .../view/RemoteAmbariClusterRegistry.java | 19 ++-- .../server/view/RemoteAmbariStreamProvider.java | 16 +-- .../server/view/ViewAmbariStreamProvider.java | 16 +-- .../ambari/server/view/ViewArchiveUtility.java | 21 ++-- .../ambari/server/view/ViewClassLoader.java | 6 +- .../ambari/server/view/ViewContextImpl.java | 25 ++--- .../view/ViewDataMigrationContextImpl.java | 19 ++-- .../server/view/ViewDataMigrationUtility.java | 3 +- .../server/view/ViewDirectoryWatcher.java | 3 +- .../view/ViewExternalSubResourceProvider.java | 14 +-- .../ambari/server/view/ViewExtractor.java | 15 +-- .../ambari/server/view/ViewProviderModule.java | 6 +- .../apache/ambari/server/view/ViewRegistry.java | 10 +- .../server/view/ViewSubResourceDefinition.java | 8 +- .../server/view/ViewSubResourceProvider.java | 24 ++--- .../view/configuration/AutoInstanceConfig.java | 5 +- .../view/configuration/InstanceConfig.java | 5 +- .../view/configuration/PersistenceConfig.java | 5 +- .../view/configuration/ResourceConfig.java | 7 +- .../server/view/configuration/ViewConfig.java | 16 +-- .../ambari/server/view/events/EventImpl.java | 6 +- .../server/view/persistence/DataStoreImpl.java | 37 ++++--- .../view/persistence/DataStoreModule.java | 20 ++-- .../InstanceValidationResultImpl.java | 5 +- .../ambari/server/RandomPortJerseyTest.java | 6 +- .../ambari/server/StateRecoveryManagerTest.java | 29 +++--- .../ambari/server/actionmanager/TestStage.java | 13 +-- .../ambari/server/agent/AgentHostInfoTest.java | 4 +- .../ambari/server/agent/TestActionQueue.java | 2 +- .../api/AmbariCsrfProtectionFilterTest.java | 15 +-- .../server/api/AmbariErrorHandlerTest.java | 32 +++--- .../server/api/UserNameOverrideFilterTest.java | 18 ++-- .../server/api/handlers/CreateHandlerTest.java | 24 +++-- .../server/api/handlers/DeleteHandlerTest.java | 24 +++-- .../api/handlers/QueryCreateHandlerTest.java | 36 +++++-- .../server/api/handlers/ReadHandlerTest.java | 32 ++++-- .../server/api/handlers/UpdateHandlerTest.java | 24 +++-- .../server/api/predicate/QueryLexerTest.java | 8 +- .../predicate/operators/AndOperatorTest.java | 5 +- .../predicate/operators/EqualsOperatorTest.java | 5 +- .../predicate/operators/FilterOperatorTest.java | 5 +- .../operators/GreaterEqualsOperatorTest.java | 5 +- .../operators/GreaterOperatorTest.java | 5 +- .../api/predicate/operators/InOperatorTest.java | 5 +- .../operators/IsEmptyOperatorTest.java | 5 +- .../operators/LessEqualsOperatorTest.java | 5 +- .../predicate/operators/LessOperatorTest.java | 5 +- .../operators/NotEqualsOperatorTest.java | 5 +- .../predicate/operators/NotOperatorTest.java | 5 +- .../api/predicate/operators/OrOperatorTest.java | 5 +- .../ExtendedResourcePredicateVisitorTest.java | 10 +- .../query/ProcessingPredicateVisitorTest.java | 10 +- .../ambari/server/api/query/QueryInfoTest.java | 10 +- .../render/ClusterBlueprintRendererTest.java | 50 ++++----- .../api/query/render/DefaultRendererTest.java | 19 ++-- .../render/MetricsPaddingRendererTest.java | 18 ++-- .../api/query/render/MinimalRendererTest.java | 24 ++--- .../resources/BaseResourceDefinitionTest.java | 20 ++-- .../BlueprintResourceDefinitionTest.java | 5 +- .../ClusterResourceDefinitionTest.java | 12 +-- ...onentStackVersionResourceDefinitionTest.java | 4 +- .../CredentialResourceDefinitionTest.java | 4 +- .../resources/FeedResourceDefinitionTest.java | 4 +- ...tKerberosIdentityResourceDefinitionTest.java | 4 +- .../resources/HostResourceDefinitionTest.java | 8 +- .../InstanceResourceDefinitionTest.java | 4 +- .../LdapSyncEventResourceDefinitionTest.java | 4 +- .../PermissionResourceDefinitionTest.java | 6 +- .../PrivilegeResourceDefinitionTest.java | 4 +- ...RepositoryVersionResourceDefinitionTest.java | 6 +- .../ServiceResourceDefinitionTest.java | 8 +- .../resources/SimpleResourceDefinitionTest.java | 8 +- .../StackConfigurationDefinitionTest.java | 8 +- ...ckConfigurationDependencyDefinitionTest.java | 6 +- .../StackServiceResourceDefinitionTest.java | 8 +- .../TargetClusterResourceDefinitionTest.java | 4 +- .../UpgradeResourceDefinitionTest.java | 6 +- .../resources/UserResourceDefinitionTest.java | 4 +- .../ViewExternalSubResourceDefinitionTest.java | 4 +- .../ViewInstanceResourceDefinitionTest.java | 6 +- .../ViewPermissionResourceDefinitionTest.java | 4 +- .../resources/ViewResourceDefinitionTest.java | 4 +- .../ViewVersionResourceDefinitionTest.java | 4 +- .../server/api/services/ActionServiceTest.java | 14 +-- .../services/ActiveWidgetLayoutServiceTest.java | 7 +- .../server/api/services/BaseRequestTest.java | 33 ++++-- .../api/services/BlueprintServiceTest.java | 13 +-- .../ClusterKerberosDescriptorServiceTest.java | 14 +-- .../services/ClusterPrivilegeServiceTest.java | 13 +-- .../ClusterStackVersionServiceTest.java | 17 +-- .../api/services/ComponentServiceTest.java | 14 +-- .../api/services/ConfigGroupServiceTest.java | 13 +-- .../api/services/ConfigurationServiceTest.java | 11 +- .../api/services/CredentialServiceTest.java | 13 +-- .../server/api/services/DeleteRequestTest.java | 10 +- .../api/services/DeleteResultMetaDataTest.java | 12 ++- .../api/services/ExtensionsServiceTest.java | 23 ++-- .../server/api/services/FeedServiceTest.java | 14 +-- .../server/api/services/GetRequestTest.java | 10 +- .../api/services/GroupPrivilegeServiceTest.java | 20 ++-- .../server/api/services/GroupServiceTest.java | 16 +-- .../api/services/HostComponentServiceTest.java | 14 +-- .../HostKerberosIdentityServiceTest.java | 13 +-- .../server/api/services/HostServiceTest.java | 14 +-- .../services/HostStackVersionServiceTest.java | 16 +-- .../api/services/InstanceServiceTest.java | 14 +-- .../api/services/LdapSyncEventServiceTest.java | 15 +-- .../server/api/services/LoggingServiceTest.java | 18 ++-- .../server/api/services/MemberServiceTest.java | 16 +-- .../api/services/NamedPropertySetTest.java | 6 +- .../api/services/PermissionServiceTest.java | 14 +-- .../api/services/PersistKeyValueImplTest.java | 9 +- .../server/api/services/PersistServiceTest.java | 7 +- .../services/PersistenceManagerImplTest.java | 26 ++--- .../server/api/services/PostRequestTest.java | 10 +- .../api/services/PrivilegeServiceTest.java | 14 +-- .../server/api/services/PutRequestTest.java | 10 +- .../api/services/QueryPostRequestTest.java | 15 +-- .../api/services/RepositoryServiceTest.java | 16 +-- .../server/api/services/RequestBodyTest.java | 8 +- .../server/api/services/RequestFactoryTest.java | 17 ++- .../services/RoleAuthorizationServiceTest.java | 13 +-- .../server/api/services/ServiceServiceTest.java | 14 +-- .../server/api/services/SettingServiceTest.java | 13 +-- .../server/api/services/StacksServiceTest.java | 23 ++-- .../api/services/TargetClusterServiceTest.java | 14 +-- .../services/UpdatePersistenceManagerTest.java | 18 ---- .../api/services/UpgradeItemServiceTest.java | 13 +-- .../services/UserAuthorizationServiceTest.java | 17 +-- .../api/services/UserPrivilegeServiceTest.java | 6 +- .../services/ViewDataMigrationServiceTest.java | 14 ++- .../api/services/ViewPermissionServiceTest.java | 13 +-- .../services/ViewSubResourceServiceTest.java | 43 ++++---- .../parsers/BodyParseExceptionTest.java | 3 +- .../parsers/JsonRequestBodyParserTest.java | 18 ++-- .../services/serializers/CsvSerializerTest.java | 24 ++--- .../serializers/JsonSerializerTest.java | 19 ++-- .../StackAdvisorBlueprintProcessorTest.java | 17 +-- .../stackadvisor/StackAdvisorRunnerTest.java | 1 - .../commands/StackAdvisorCommandTest.java | 1 - .../audit/AccessUnauthorizedAuditEventTest.java | 6 +- .../audit/ActionDBAAccessorAuditlogTest.java | 4 +- .../server/audit/LoginAuditEventTest.java | 6 +- .../server/audit/LogoutAuditEventTest.java | 6 +- .../audit/OperationStatusAuditEventTest.java | 6 +- .../StartOperationRequestAuditEventTest.java | 6 +- .../server/audit/TaskStatusAuditEventTest.java | 6 +- ...angeSecurityStateKerberosAuditEventTest.java | 6 +- .../CreateKeyTabKerberosAuditEventTest.java | 6 +- .../CreatePrincipalKerberosAuditEventTest.java | 6 +- .../DestroyPrincipalKerberosAuditEventTest.java | 6 +- .../audit/request/DefaultEventCreatorTest.java | 4 +- .../audit/request/RequestAuditLoggerTest.java | 6 +- .../creator/AlertGroupEventCreatorTest.java | 4 +- .../creator/AlertTargetEventCreatorTest.java | 4 +- .../creator/BlueprintEventCreatorTest.java | 4 +- .../BlueprintExportEventCreatorTest.java | 4 +- .../creator/ComponentEventCreatorTest.java | 4 +- .../ConfigurationChangeEventCreatorTest.java | 4 +- .../creator/CredentialEventCreatorTest.java | 4 +- .../creator/DefaultEventCreatorTest.java | 4 +- .../request/creator/GroupEventCreatorTest.java | 4 +- .../request/creator/HostEventCreatorTest.java | 4 +- .../request/creator/MemberEventCreatorTest.java | 4 +- .../creator/PrivilegeEventCreatorTest.java | 4 +- .../creator/RepositoryEventCreatorTest.java | 4 +- .../RepositoryVersionEventCreatorTest.java | 4 +- .../creator/RequestEventCreatorTest.java | 4 +- .../ServiceConfigDownloadEventCreatorTest.java | 4 +- .../creator/ServiceEventCreatorTest.java | 4 +- .../creator/UnauthorizedEventCreatorTest.java | 4 +- .../creator/UpgradeEventCreatorTest.java | 4 +- .../creator/UpgradeItemEventCreatorTest.java | 4 +- .../request/creator/UserEventCreatorTest.java | 4 +- .../creator/ViewInstanceEventCreatorTest.java | 4 +- .../creator/ViewPrivilegeEventCreatorTest.java | 4 +- .../server/bootstrap/BootStrapResourceTest.java | 8 +- .../checks/AbstractCheckDescriptorTest.java | 25 ++--- .../server/checks/AtlasPresenceCheckTest.java | 4 +- .../DatabaseConsistencyCheckHelperTest.java | 6 +- ...ardcodedStackVersionPropertiesCheckTest.java | 6 +- ...duce2JobHistoryStatePreservingCheckTest.java | 8 +- .../server/checks/MpackInstallCheckerTest.java | 23 ++-- .../checks/PreviousUpgradeCompletedTest.java | 7 +- .../server/checks/RangerAuditDbCheckTest.java | 4 - .../SecondaryNamenodeDeletedCheckTest.java | 1 - ...rvicesNamenodeHighAvailabilityCheckTest.java | 1 - .../ServicesNamenodeTruncateCheckTest.java | 3 +- .../ServicesYarnWorkPreservingCheckTest.java | 1 - .../server/checks/VersionMismatchCheckTest.java | 17 +-- .../server/cleanup/CleanupServiceImplTest.java | 12 +-- .../server/collections/PredicateUtilsTest.java | 9 +- .../collections/functors/AndPredicateTest.java | 10 +- .../functors/ContainsPredicateTest.java | 10 +- .../functors/ContextTransformerTest.java | 7 +- .../functors/EqualsPredicateTest.java | 10 +- .../collections/functors/NotPredicateTest.java | 10 +- .../collections/functors/OrPredicateTest.java | 10 +- .../controller/AmbariHandlerListTest.java | 27 ++--- .../server/controller/AmbariServerTest.java | 10 +- .../controller/AmbariSessionManagerTest.java | 12 +-- .../controller/AuthToLocalBuilderTest.java | 8 +- .../server/controller/KerberosHelperTest.java | 36 +++---- .../server/controller/LdapSyncRequestTest.java | 6 +- .../controller/StackServiceResponseTest.java | 4 +- .../GSInstallerClusterProviderTest.java | 7 +- .../GSInstallerComponentProviderTest.java | 4 +- .../GSInstallerHostComponentProviderTest.java | 4 +- .../GSInstallerHostProviderTest.java | 7 +- .../GSInstallerNoOpProviderTest.java | 5 +- .../GSInstallerServiceProviderTest.java | 5 +- .../AbstractControllerResourceProviderTest.java | 25 ++--- .../AbstractDRResourceProviderTest.java | 11 +- .../internal/AbstractPropertyProviderTest.java | 6 +- .../internal/ActionResourceProviderTest.java | 25 ++--- .../ActiveWidgetLayoutResourceProviderTest.java | 37 +++---- .../AlertGroupResourceProviderTest.java | 4 +- .../AlertHistoryResourceProviderTest.java | 4 +- .../AlertNoticeResourceProviderTest.java | 4 +- .../internal/AlertResourceProviderTest.java | 2 +- .../AmbariPrivilegeResourceProviderTest.java | 17 +-- .../internal/ArtifactResourceProviderTest.java | 57 +++++----- .../AtlasServerHttpPropertyRequestTest.java | 14 +-- .../internal/BlueprintResourceProviderTest.java | 59 +++++------ .../internal/ClusterControllerImplTest.java | 4 +- ...rKerberosDescriptorResourceProviderTest.java | 36 ++++--- .../ClusterPrivilegeResourceProviderTest.java | 31 +++--- .../internal/ComponentResourceProviderTest.java | 53 +++++----- .../ConfigGroupResourceProviderTest.java | 52 +++++----- .../internal/DeleteStatusMetaDataTest.java | 7 +- .../internal/ExportBlueprintRequestTest.java | 20 ++-- .../internal/ExtensionResourceProviderTest.java | 16 +-- .../internal/FeedResourceProviderTest.java | 20 ++-- .../GroupPrivilegeResourceProviderTest.java | 21 ++-- ...ostComponentProcessResourceProviderTest.java | 4 +- ...ostKerberosIdentityResourceProviderTest.java | 24 ++--- .../internal/InstanceResourceProviderTest.java | 26 ++--- .../KerberosDescriptorResourceProviderTest.java | 20 ++-- .../LdapSyncEventResourceProviderTest.java | 16 +-- .../internal/MemberResourceProviderTest.java | 11 +- .../internal/MetricsServiceProviderTest.java | 15 +-- .../internal/PageRequestImplTest.java | 4 - .../internal/PageResponseImplTest.java | 5 +- .../PermissionResourceProviderTest.java | 22 ++-- .../internal/PropertyPredicateVisitorTest.java | 5 +- .../internal/ProvisionClusterRequestTest.java | 48 ++++----- .../internal/QueryResponseImplTest.java | 7 +- .../RecommendationResourceProviderTest.java | 2 - .../RemoteClusterResourceProviderTest.java | 38 +++---- .../controller/internal/RequestImplTest.java | 4 +- .../internal/RequestOperationLevelTest.java | 8 +- .../RequestScheduleResourceProviderTest.java | 31 +++--- .../internal/RequestStageContainerTest.java | 26 ++--- .../internal/RequestStatusImplTest.java | 6 +- .../controller/internal/ResourceImplTest.java | 7 +- .../RoleAuthorizationResourceProviderTest.java | 23 ++-- ...ootServiceComponentPropertyProviderTest.java | 12 +-- ...ootServiceComponentResourceProviderTest.java | 10 +- .../internal/ScaleClusterRequestTest.java | 40 +++---- .../controller/internal/SchemaImplTest.java | 22 +++- .../internal/SettingResourceProviderTest.java | 36 +++---- .../SimplifyingPredicateVisitorTest.java | 25 ++--- .../StackAdvisorResourceProviderTest.java | 20 ++-- ...igurationDependencyResourceProviderTest.java | 16 +-- .../StackDependencyResourceProviderTest.java | 20 ++-- ...kLevelConfigurationResourceProviderTest.java | 1 - .../internal/StackResourceProviderTest.java | 16 +-- .../StackServiceResourceProviderTest.java | 27 ++--- .../server/controller/internal/StackTest.java | 47 ++++----- .../TargetClusterResourceProviderTest.java | 26 ++--- .../internal/TaskResourceProviderTest.java | 1 - .../internal/TestIvoryProviderModule.java | 6 +- .../controller/internal/TestIvoryService.java | 10 +- .../internal/URLStreamProviderTest.java | 15 ++- .../UserAuthorizationResourceProviderTest.java | 6 +- .../UserPrivilegeResourceProviderTest.java | 21 ++-- .../internal/UserResourceProviderDBTest.java | 32 +++--- .../internal/UserResourceProviderTest.java | 32 +++--- .../ValidationResourceProviderTest.java | 20 ++-- .../ViewInstanceResourceProviderTest.java | 34 +++--- .../ViewPermissionResourceProviderTest.java | 26 ++--- .../ViewPrivilegeResourceProviderTest.java | 24 ++--- .../internal/ViewURLResourceProviderTest.java | 20 ++-- .../WidgetLayoutResourceProviderTest.java | 53 +++++----- .../internal/WidgetResourceProviderTest.java | 47 +++++---- .../server/controller/ivory/ClusterTest.java | 4 +- .../server/controller/ivory/FeedTest.java | 6 +- .../jdbc/TestJDBCResourceProvider.java | 4 +- .../controller/jmx/TestStreamProvider.java | 7 +- .../logging/LogLevelQueryResponseTest.java | 11 +- .../controller/logging/LogLineResultTest.java | 8 +- .../logging/LogQueryResponseTest.java | 10 +- .../LogSearchDataRetrievalServiceTest.java | 19 ++-- .../LoggingRequestHelperFactoryImplTest.java | 18 ++-- .../logging/LoggingRequestHelperImplTest.java | 31 +++--- .../LoggingSearchPropertyProviderTest.java | 31 +++--- .../server/controller/logging/UtilsTest.java | 15 ++- .../ThreadPoolEnabledPropertyProviderTest.java | 6 +- .../metrics/ganglia/GangliaMetricTest.java | 5 +- .../ganglia/GangliaPropertyProviderTest.java | 38 +++---- .../GangliaReportPropertyProviderTest.java | 14 +-- .../metrics/ganglia/TestStreamProvider.java | 8 +- .../timeline/AMSPropertyProviderTest.java | 57 ++++------ .../timeline/AMSReportPropertyProviderTest.java | 20 ++-- .../timeline/MetricsPaddingMethodTest.java | 6 +- .../timeline/MetricsRequestHelperTest.java | 23 ++-- .../cache/TimelineMetricCacheSizingTest.java | 13 +-- .../timeline/cache/TimelineMetricCacheTest.java | 61 +++++------ .../controller/predicate/AndPredicateTest.java | 5 +- .../predicate/CategoryIsEmptyPredicateTest.java | 7 +- .../predicate/CategoryPredicateTest.java | 3 +- .../predicate/EqualsPredicateTest.java | 5 +- .../predicate/FilterPredicateTest.java | 5 +- .../predicate/GreaterEqualsPredicateTest.java | 5 +- .../predicate/GreaterPredicateTest.java | 5 +- .../predicate/LessEqualsPredicateTest.java | 5 +- .../controller/predicate/LessPredicateTest.java | 5 +- .../controller/predicate/NotPredicateTest.java | 5 +- .../controller/predicate/OrPredicateTest.java | 5 +- .../predicate/PredicateVisitorTest.java | 3 +- ...ThreadPoolExecutorCompletionServiceTest.java | 4 +- .../utilities/KerberosCheckerTest.java | 22 ++-- .../utilities/PredicateBuilderTest.java | 3 +- .../utilities/webserver/StartServer.java | 10 +- .../ActionDefinitionManagerTest.java | 3 +- .../upgrade/StackUpgradeFinishListenerTest.java | 8 -- .../publishers/VersionEventPublisherTest.java | 19 ++-- .../ambari/server/logging/LockFactoryTest.java | 10 +- .../ProfiledReentrantReadWriteLockTest.java | 11 +- .../server/metadata/RoleCommandOrderTest.java | 17 +-- .../ambari/server/metadata/RoleGraphTest.java | 5 +- .../dispatchers/AmbariSNMPDispatcherTest.java | 32 ++++-- .../dispatchers/EmailDispatcherTest.java | 17 +-- .../dispatchers/SNMPDispatcherTest.java | 32 ++++-- .../orm/AmbariJpaLocalTxnInterceptorTest.java | 17 +-- .../server/orm/InMemoryDefaultTestModule.java | 5 +- .../apache/ambari/server/orm/TestOrmImpl.java | 6 +- .../server/orm/dao/AlertDefinitionDAOTest.java | 35 +++---- .../ambari/server/orm/dao/BlueprintDAOTest.java | 17 +-- .../ambari/server/orm/dao/GroupDAOTest.java | 11 +- .../orm/dao/HostConfigMappingDAOTest.java | 6 +- .../orm/dao/KerberosDescriptorDAOTest.java | 15 +-- .../ambari/server/orm/dao/PrincipalDAOTest.java | 15 +-- .../server/orm/dao/PrincipalTypeDAOTest.java | 15 +-- .../server/orm/dao/RequestScheduleDAOTest.java | 4 +- .../ambari/server/orm/dao/ResourceDAOTest.java | 15 +-- .../server/orm/dao/ResourceTypeDAOTest.java | 15 +-- .../ambari/server/orm/dao/StageDAOTest.java | 25 ++--- .../orm/dao/TopologyLogicalRequestDAOTest.java | 16 +-- .../server/orm/dao/TopologyRequestDAOTest.java | 17 +-- .../ambari/server/orm/dao/UserDAOTest.java | 9 +- .../server/orm/dao/ViewInstanceDAOTest.java | 15 +-- .../ambari/server/orm/db/DDLTestUtils.java | 31 ++++-- .../apache/ambari/server/orm/db/DDLTests.java | 17 +-- .../entities/BlueprintConfigEntityPKTest.java | 4 +- .../orm/entities/BlueprintConfigEntityTest.java | 4 +- .../orm/entities/BlueprintEntityTest.java | 1 - .../entities/BlueprintSettingEntityTest.java | 4 +- .../server/orm/entities/HostEntityTest.java | 6 +- .../entities/HostGroupComponentEntityTest.java | 4 +- .../entities/HostGroupConfigEntityPKTest.java | 4 +- .../orm/entities/HostGroupConfigEntityTest.java | 4 +- .../orm/entities/HostGroupEntityTest.java | 6 +- .../orm/entities/LdapSyncEventEntityTest.java | 6 +- .../orm/entities/LdapSyncSpecEntityTest.java | 6 +- .../orm/entities/PrincipalEntityTest.java | 6 +- .../server/orm/entities/ResourceEntityTest.java | 6 +- .../orm/entities/ServiceConfigEntityTest.java | 5 +- .../server/orm/entities/SettingEntityTest.java | 4 +- .../server/orm/entities/StageEntityTest.java | 4 +- .../server/orm/entities/ViewEntityTest.java | 18 ++-- .../orm/entities/ViewInstanceEntityTest.java | 18 ++-- .../ambari/server/proxy/ProxyServiceTest.java | 48 ++++----- .../scheduler/ExecutionScheduleManagerTest.java | 58 ++++++----- .../server/security/AmbariLdapUtilsTest.java | 20 ++-- .../security/SecurePasswordHelperTest.java | 7 +- .../server/security/SecurityFilterTest.java | 15 ++- .../server/security/SecurityHelperImplTest.java | 5 +- .../security/TestAuthenticationFactory.java | 12 +-- .../AmbariBasicAuthenticationFilterTest.java | 21 ++-- ...mbariDelegatingAuthenticationFilterTest.java | 11 +- .../AmbariJWTAuthenticationFilterTest.java | 45 ++++---- ...AmbariAuthToLocalUserDetailsServiceTest.java | 11 +- .../AmbariKerberosAuthenticationFilterTest.java | 8 +- ...ariKerberosAuthenticationPropertiesTest.java | 8 +- .../AmbariKerberosTicketValidatorTest.java | 4 +- .../authorization/AmbariAuthenticationTest.java | 14 +-- .../AmbariAuthorizationFilterTest.java | 42 ++++---- ...uthenticationProviderForDNWithSpaceTest.java | 19 ++-- .../AmbariLdapBindAuthenticatorTest.java | 20 ++-- .../AmbariLocalUserProviderTest.java | 21 ++-- .../AmbariUserAuthenticationFilterTest.java | 38 +++---- .../AuthorizationHelperInitializer.java | 7 +- .../authorization/AuthorizationHelperTest.java | 40 ++++--- .../authorization/LdapServerPropertiesTest.java | 16 +-- .../authorization/ResourceTypeTest.java | 4 +- .../authorization/RoleAuthorizationTest.java | 4 +- .../TestAmbariLdapAuthoritiesPopulator.java | 11 +- .../security/authorization/TestUsers.java | 3 +- .../security/authorization/UsersTest.java | 28 +++-- .../jwt/JwtAuthenticationFilterTest.java | 64 ++++++------ .../jwt/JwtAuthenticationPropertiesTest.java | 4 +- .../security/encryption/AESEncryptorTest.java | 3 +- .../encryption/CredentialStoreTest.java | 7 +- .../ldap/AmbariLdapDataPopulatorTest.java | 28 +++-- .../server/serveraction/ActionLogTest.java | 3 +- .../server/serveraction/MockServerAction.java | 7 +- .../ADKerberosOperationHandlerTest.java | 31 +++--- ...AbstractPrepareKerberosServerActionTest.java | 18 ++-- ...nfigureAmbariIdentitiesServerActionTest.java | 21 ++-- .../CreateKeytabFilesServerActionTest.java | 12 +-- .../kerberos/DeconstructedPrincipalTest.java | 6 +- .../IPAKerberosOperationHandlerTest.java | 18 ++-- .../serveraction/kerberos/KDCTypeTest.java | 3 +- .../kerberos/KerberosConfigDataFileTest.java | 9 +- .../kerberos/KerberosIdentityDataFileTest.java | 9 +- .../KerberosOperationHandlerFactoryTest.java | 13 ++- .../kerberos/KerberosOperationHandlerTest.java | 17 +-- .../kerberos/KerberosServerActionTest.java | 29 +++--- .../MITKerberosOperationHandlerTest.java | 22 ++-- .../upgrades/FixLzoCodecPathTest.java | 4 +- .../upgrades/OozieConfigCalculationTest.java | 6 +- .../RangerWebAlertConfigActionTest.java | 23 ++-- .../server/stack/ComponentModuleTest.java | 22 ++-- .../server/stack/KerberosDescriptorTest.java | 8 +- .../QuickLinksConfigurationModuleTest.java | 19 ++-- .../ambari/server/stack/RepoUtilTest.java | 6 +- .../ambari/server/stack/ServiceModuleTest.java | 45 ++++---- .../server/stack/StackManagerExtensionTest.java | 4 - .../ambari/server/stack/StackManagerMock.java | 1 + .../ambari/server/stack/ThemeModuleTest.java | 7 +- .../UpdateActiveRepoVersionOnStartupTest.java | 7 +- .../apache/ambari/server/state/AlertTest.java | 4 +- .../ambari/server/state/CheckHelperTest.java | 4 +- .../server/state/ConfigMergeHelperTest.java | 42 ++++---- .../ambari/server/state/DesiredConfigTest.java | 5 +- .../ambari/server/state/PropertyInfoTest.java | 30 +++--- .../ambari/server/state/ServiceInfoTest.java | 19 ++-- .../server/state/ServicePropertiesTest.java | 11 +- .../server/state/ServicePropertyInfoTest.java | 12 ++- .../ambari/server/state/action/JobTest.java | 10 -- .../alerts/AggregateAlertListenerTest.java | 2 +- .../alerts/AlertDefinitionEqualityTest.java | 4 +- .../state/alerts/AlertDefinitionHashTest.java | 6 +- .../server/state/cluster/ClustersImplTest.java | 14 +-- .../KerberosComponentDescriptorTest.java | 16 +-- .../KerberosConfigurationDescriptorTest.java | 14 ++- .../state/kerberos/KerberosDescriptorTest.java | 14 +-- .../KerberosDescriptorUpdateHelperTest.java | 27 ++--- .../KerberosIdentityDescriptorTest.java | 16 +-- .../kerberos/KerberosKeytabDescriptorTest.java | 12 ++- .../KerberosPrincipalDescriptorTest.java | 11 +- .../kerberos/KerberosServiceDescriptorTest.java | 14 +-- .../kerberos/VariableReplacementHelperTest.java | 7 +- .../state/scheduler/BatchRequestJobTest.java | 26 ++--- .../services/RetryUpgradeActionServiceTest.java | 13 +-- .../state/stack/ConfigUpgradePackTest.java | 29 +++--- .../ambari/server/state/stack/OSFamilyTest.java | 15 ++- .../upgrade/RepositoryVersionHelperTest.java | 4 +- .../server/testing/DBInconsistencyTests.java | 18 ++-- .../server/testing/DeadlockWarningThread.java | 4 +- .../server/testing/DeadlockedThreadsTest.java | 2 +- .../topology/AsyncCallableServiceTest.java | 21 ++-- .../server/topology/BlueprintFactoryTest.java | 36 +++---- .../server/topology/BlueprintImplTest.java | 20 ++-- .../topology/BlueprintValidatorImplTest.java | 1 + .../ClusterConfigurationRequestTest.java | 47 ++++----- .../ClusterDeployWithStartOnlyTest.java | 35 +++---- ...InstallWithoutStartOnComponentLevelTest.java | 34 +++--- .../ClusterInstallWithoutStartTest.java | 35 +++---- .../topology/ClusterTopologyImplTest.java | 22 ++-- .../topology/ConfigurationFactoryTest.java | 6 +- .../server/topology/ConfigurationTest.java | 8 +- .../topology/ConfigureClusterTaskTest.java | 25 ++--- .../server/topology/HostGroupInfoTest.java | 16 ++- .../server/topology/LogicalRequestTest.java | 12 +-- .../topology/RequiredPasswordValidatorTest.java | 22 ++-- .../SecurityConfigurationFactoryTest.java | 13 +-- .../server/topology/SettingFactoryTest.java | 4 +- .../ambari/server/topology/SettingTest.java | 4 +- .../server/topology/TopologyManagerTest.java | 53 +++++----- .../ambari/server/upgrade/SectionDDL.java | 4 +- .../server/upgrade/UpgradeCatalog210Test.java | 3 +- .../server/upgrade/UpgradeCatalog211Test.java | 12 +-- .../server/upgrade/UpgradeCatalog2121Test.java | 11 +- .../server/upgrade/UpgradeCatalog212Test.java | 62 +++++------ .../server/upgrade/UpgradeCatalog220Test.java | 80 +++++++------- .../server/upgrade/UpgradeCatalog221Test.java | 65 ++++++------ .../server/upgrade/UpgradeCatalog222Test.java | 5 +- .../server/upgrade/UpgradeCatalog230Test.java | 10 +- .../server/upgrade/UpgradeCatalog240Test.java | 10 +- .../server/upgrade/UpgradeCatalog242Test.java | 9 +- .../server/upgrade/UpgradeCatalog250Test.java | 63 +++++------ .../server/upgrade/UpgradeCatalogTest.java | 30 ++---- .../utils/CollectionPresentationUtils.java | 13 +-- .../ambari/server/utils/HostUtilsTest.java | 3 +- .../ambari/server/utils/RequestUtilsTest.java | 1 + .../ambari/server/utils/SetUtilsTest.java | 7 +- .../ambari/server/utils/TestDateUtils.java | 9 +- .../ambari/server/utils/TestHTTPUtils.java | 3 +- .../ambari/server/utils/TestJsonUtils.java | 3 +- .../ambari/server/utils/TestParallel.java | 12 +-- .../server/utils/TestShellCommandUtil.java | 13 +-- .../ambari/server/utils/TestVersionUtils.java | 4 +- .../ambari/server/view/ClusterImplTest.java | 20 ++-- .../ambari/server/view/DefaultMaskerTest.java | 5 +- .../server/view/HttpImpersonatorImplTest.java | 34 ++---- .../server/view/RemoteAmbariClusterTest.java | 30 +++--- .../view/ViewAmbariStreamProviderTest.java | 22 ++-- .../server/view/ViewArchiveUtilityTest.java | 4 +- .../ambari/server/view/ViewClassLoaderTest.java | 15 +-- .../ambari/server/view/ViewContextImplTest.java | 18 ++-- .../view/ViewDataMigrationContextImplTest.java | 21 +++- .../view/ViewDataMigrationUtilityTest.java | 19 ++-- .../ambari/server/view/ViewExtractorTest.java | 37 +++---- .../ambari/server/view/ViewRegistryTest.java | 7 +- .../view/ViewSubResourceDefinitionTest.java | 4 +- .../view/ViewSubResourceProviderTest.java | 14 +-- .../configuration/AutoInstanceConfigTest.java | 11 +- .../view/configuration/EntityConfigTest.java | 7 +- .../view/configuration/InstanceConfigTest.java | 7 +- .../view/configuration/ParameterConfigTest.java | 7 +- .../configuration/PermissionConfigTest.java | 7 +- .../view/configuration/PropertyConfigTest.java | 4 +- .../view/configuration/ResourceConfigTest.java | 7 +- .../view/configuration/ViewConfigTest.java | 21 ++-- .../server/view/events/EventImplTest.java | 8 +- .../view/persistence/DataStoreImplTest.java | 48 ++++----- .../InstanceValidationResultImplTest.java | 9 +- .../validation/ValidationResultImplTest.java | 3 +- 1184 files changed, 7197 insertions(+), 6649 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/checkstyle.xml ---------------------------------------------------------------------- diff --git a/ambari-server/checkstyle.xml b/ambari-server/checkstyle.xml index b1c3c4a..0c66556 100644 --- a/ambari-server/checkstyle.xml +++ b/ambari-server/checkstyle.xml @@ -15,5 +15,18 @@ <module name="AvoidTransactionalOnPrivateMethodsCheck"/> <module name="FallThrough"/> + + <!-- imports --> + <module name="AvoidStarImport"/> + <module name="IllegalImport"/> + <module name="ImportOrder"> + <property name="groups" value="java,javax,org,com*"/> + <property name="ordered" value="true"/> + <property name="separated" value="true"/> + <property name="option" value="top"/> <!-- static imports --> + <property name="sortStaticImportsAlphabetically" value="true"/> + </module> + <module name="RedundantImport"/> + <module name="UnusedImports"/> </module> </module> http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java index 1f10d43..2ffa3c0 100644 --- a/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java +++ b/ambari-server/src/main/java/com/google/inject/persist/jpa/AmbariJpaPersistService.java @@ -18,11 +18,11 @@ package com.google.inject.persist.jpa; +import java.util.Properties; + import com.google.inject.Inject; import com.google.inject.internal.util.$Nullable; -import java.util.Properties; - /** * Override non-public class limitations as we need non-interface method */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java index aa6f053..26e5be8 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/StateRecoveryManager.java @@ -18,7 +18,8 @@ package org.apache.ambari.server; -import com.google.inject.Inject; +import java.util.List; + import org.apache.ambari.server.orm.dao.ClusterVersionDAO; import org.apache.ambari.server.orm.dao.HostVersionDAO; import org.apache.ambari.server.orm.entities.ClusterVersionEntity; @@ -27,7 +28,7 @@ import org.apache.ambari.server.state.RepositoryVersionState; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.List; +import com.google.inject.Inject; /** * Is executed on server start. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java index 0562c15..f38348b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/ExecutionCommandWrapper.java @@ -19,7 +19,6 @@ package org.apache.ambari.server.actionmanager; import java.util.HashMap; import java.util.Map; -import java.util.Set; import java.util.TreeMap; import org.apache.ambari.server.AmbariException; @@ -79,7 +78,6 @@ public class ExecutionCommandWrapper { * long as it has been instructed to set updated ones at execution time. * * @return - * @see ExecutionCommand#setForceRefreshConfigTagsBeforeExecution(Set) */ public ExecutionCommand getExecutionCommand() { if (executionCommand != null) { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestFactory.java index 3313582..bc0223c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/actionmanager/RequestFactory.java @@ -18,12 +18,13 @@ package org.apache.ambari.server.actionmanager; -import com.google.inject.assistedinject.Assisted; +import java.util.Collection; + import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.controller.ExecuteActionRequest; import org.apache.ambari.server.orm.entities.RequestEntity; -import java.util.Collection; +import com.google.inject.assistedinject.Assisted; public interface RequestFactory { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 319d72d..4a05b32 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 @@ -19,7 +19,6 @@ package org.apache.ambari.server.actionmanager; import java.util.ArrayList; import java.util.Collection; -import java.util.EnumSet; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedHashMap; @@ -34,7 +33,6 @@ import org.apache.ambari.server.Role; import org.apache.ambari.server.RoleCommand; import org.apache.ambari.server.agent.AgentCommand.AgentCommandType; import org.apache.ambari.server.agent.ExecutionCommand; -import org.apache.ambari.server.metadata.RoleCommandOrder; import org.apache.ambari.server.metadata.RoleCommandPair; import org.apache.ambari.server.orm.dao.HostRoleCommandDAO; import org.apache.ambari.server.orm.entities.HostRoleCommandEntity; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java index ede3965..64d0865 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/AgentEnv.java @@ -18,8 +18,6 @@ package org.apache.ambari.server.agent; import com.google.gson.annotations.SerializedName; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; /** * Agent environment data. http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 01195bf..d0b7cc6 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 @@ -18,13 +18,14 @@ package org.apache.ambari.server.agent; -import com.google.inject.Singleton; +import java.util.HashMap; +import java.util.Map; + import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.util.HashMap; -import java.util.Map; +import com.google.inject.Singleton; /** http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/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 a25b875..b7d7476 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 @@ -22,9 +22,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -33,51 +31,23 @@ import java.util.regex.Pattern; import org.apache.ambari.server.AmbariException; import org.apache.ambari.server.HostNotFoundException; -import org.apache.ambari.server.Role; -import org.apache.ambari.server.RoleCommand; -import org.apache.ambari.server.ServiceComponentHostNotFoundException; -import org.apache.ambari.server.ServiceComponentNotFoundException; -import org.apache.ambari.server.ServiceNotFoundException; import org.apache.ambari.server.actionmanager.ActionManager; -import org.apache.ambari.server.actionmanager.HostRoleCommand; -import org.apache.ambari.server.actionmanager.HostRoleStatus; import org.apache.ambari.server.api.services.AmbariMetaInfo; import org.apache.ambari.server.configuration.Configuration; -import org.apache.ambari.server.controller.MaintenanceStateHelper; -import org.apache.ambari.server.events.ActionFinalReportReceivedEvent; -import org.apache.ambari.server.events.AlertEvent; -import org.apache.ambari.server.events.AlertReceivedEvent; -import org.apache.ambari.server.events.HostComponentVersionAdvertisedEvent; -import org.apache.ambari.server.events.publishers.AlertEventPublisher; -import org.apache.ambari.server.events.publishers.AmbariEventPublisher; -import org.apache.ambari.server.events.publishers.VersionEventPublisher; -import org.apache.ambari.server.metadata.ActionMetadata; -import org.apache.ambari.server.orm.dao.HostDAO; -import org.apache.ambari.server.orm.dao.KerberosPrincipalHostDAO; -import org.apache.ambari.server.orm.entities.HostEntity; import org.apache.ambari.server.serveraction.kerberos.KerberosIdentityDataFileReader; import org.apache.ambari.server.serveraction.kerberos.KerberosIdentityDataFileReaderFactory; import org.apache.ambari.server.serveraction.kerberos.KerberosServerAction; import org.apache.ambari.server.state.AgentVersion; -import org.apache.ambari.server.state.Alert; import org.apache.ambari.server.state.Cluster; import org.apache.ambari.server.state.Clusters; import org.apache.ambari.server.state.ComponentInfo; import org.apache.ambari.server.state.ConfigHelper; import org.apache.ambari.server.state.Host; -import org.apache.ambari.server.state.HostHealthStatus; -import org.apache.ambari.server.state.HostHealthStatus.HealthStatus; import org.apache.ambari.server.state.HostState; -import org.apache.ambari.server.state.MaintenanceState; -import org.apache.ambari.server.state.SecurityState; -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.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.UpgradeState; import org.apache.ambari.server.state.alert.AlertDefinition; import org.apache.ambari.server.state.alert.AlertDefinitionHash; import org.apache.ambari.server.state.fsm.InvalidStateTransitionException; @@ -85,26 +55,14 @@ import org.apache.ambari.server.state.host.HostHealthyHeartbeatEvent; import org.apache.ambari.server.state.host.HostRegistrationRequestEvent; import org.apache.ambari.server.state.host.HostStatusUpdatesReceivedEvent; import org.apache.ambari.server.state.host.HostUnhealthyHeartbeatEvent; -import org.apache.ambari.server.state.scheduler.RequestExecution; -import org.apache.ambari.server.state.stack.upgrade.Direction; -import org.apache.ambari.server.state.stack.upgrade.UpgradeType; -import org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpFailedEvent; -import org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpInProgressEvent; -import org.apache.ambari.server.state.svccomphost.ServiceComponentHostOpSucceededEvent; -import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStartedEvent; -import org.apache.ambari.server.state.svccomphost.ServiceComponentHostStoppedEvent; import org.apache.ambari.server.utils.StageUtils; import org.apache.ambari.server.utils.VersionUtils; import org.apache.commons.codec.binary.Base64; import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.gson.Gson; -import com.google.gson.JsonSyntaxException; -import com.google.gson.annotations.SerializedName; import com.google.inject.Inject; import com.google.inject.Injector; import com.google.inject.Singleton; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java ---------------------------------------------------------------------- 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 8f4782e..ed84e45 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 @@ -19,8 +19,6 @@ package org.apache.ambari.server.agent; import java.util.ArrayList; -import java.util.Collection; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java index f9d3e7c..40b2260 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/RecoveryReport.java @@ -17,12 +17,12 @@ */ package org.apache.ambari.server.agent; -import org.codehaus.jackson.annotate.JsonProperty; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.codehaus.jackson.annotate.JsonProperty; + public class RecoveryReport { http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java index 5dec53c..5dd9e6f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java @@ -17,12 +17,13 @@ */ package org.apache.ambari.server.agent; -import com.google.gson.annotations.SerializedName; -import org.apache.ambari.server.state.State; - import java.util.HashMap; import java.util.Map; +import org.apache.ambari.server.state.State; + +import com.google.gson.annotations.SerializedName; + /** * Command to report the status of a list of services in roles. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java index ff84874..120fab5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/rest/AgentResource.java @@ -36,14 +36,13 @@ import org.apache.ambari.server.agent.HeartBeatHandler; import org.apache.ambari.server.agent.HeartBeatResponse; import org.apache.ambari.server.agent.Register; import org.apache.ambari.server.agent.RegistrationResponse; +import org.apache.ambari.server.agent.RegistrationStatus; import org.apache.ambari.server.state.fsm.InvalidStateTransitionException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import com.google.inject.Inject; -import org.apache.ambari.server.agent.RegistrationStatus; - /** * Agent Resource represents Ambari agent controller. * It provides API for Ambari agents to get the cluster configuration changes http://git-wip-us.apache.org/repos/asf/ambari/blob/e4db5709/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java index 2325337..60c0e77 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/AmbariCsrfProtectionFilter.java @@ -17,17 +17,19 @@ */ package org.apache.ambari.server.api; -import com.sun.jersey.spi.container.ContainerRequest; -import com.sun.jersey.spi.container.ContainerRequestFilter; -import org.apache.ambari.server.api.services.ResultStatus; -import org.apache.ambari.server.api.services.serializers.JsonSerializer; +import java.util.Collections; +import java.util.HashSet; +import java.util.Set; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; -import java.util.Collections; -import java.util.HashSet; -import java.util.Set; + +import org.apache.ambari.server.api.services.ResultStatus; +import org.apache.ambari.server.api.services.serializers.JsonSerializer; + +import com.sun.jersey.spi.container.ContainerRequest; +import com.sun.jersey.spi.container.ContainerRequestFilter; public class AmbariCsrfProtectionFilter implements ContainerRequestFilter { private static final Set<String> IGNORED_METHODS;
