AMBARI-19149. Code cleanup: unresolved references in javadoc
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/893f97e4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/893f97e4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/893f97e4 Branch: refs/heads/branch-3.0-perf Commit: 893f97e437990a154229d7545c2a6797defd714c Parents: b95dcc3 Author: Attila Doroszlai <adorosz...@hortonworks.com> Authored: Wed Apr 12 15:22:06 2017 +0200 Committer: Andrew Onishuk <aonis...@hortonworks.com> Committed: Mon Apr 24 14:59:56 2017 +0300 ---------------------------------------------------------------------- .../ambari/server/actionmanager/Stage.java | 2 +- .../ambari/server/agent/HeartBeatResponse.java | 3 -- .../ambari/server/api/query/JpaSortBuilder.java | 2 +- .../RequestScheduleResourceDefinition.java | 6 +-- .../server/api/rest/BootStrapResource.java | 2 +- .../api/services/AlertDefinitionService.java | 3 -- .../ambari/server/checks/ServicesUpCheck.java | 2 - .../server/configuration/Configuration.java | 52 +++----------------- .../internal/AbstractProviderModule.java | 2 +- .../internal/UpgradeResourceProvider.java | 5 +- .../VersionDefinitionResourceProvider.java | 1 - .../events/AlertDefinitionDisabledEvent.java | 2 +- .../EntityManagerCacheInvalidationEvent.java | 5 -- .../listeners/alerts/AlertReceivedListener.java | 2 +- .../apache/ambari/server/orm/DBAccessor.java | 3 +- .../ambari/server/orm/dao/ExtensionDAO.java | 2 +- .../ambari/server/orm/dao/ExtensionLinkDAO.java | 3 +- .../ambari/server/orm/dao/RequestDAO.java | 4 +- .../orm/entities/AlertDefinitionEntity.java | 2 +- .../server/orm/entities/UpgradeEntity.java | 3 -- .../server/orm/entities/UpgradeGroupEntity.java | 2 +- .../server/orm/entities/ViewURLEntity.java | 1 - .../server/orm/helpers/dbms/DbmsHelper.java | 1 - .../authorization/LdapServerProperties.java | 4 +- .../apache/ambari/server/stack/StackModule.java | 2 +- .../org/apache/ambari/server/state/Cluster.java | 3 +- .../apache/ambari/server/state/ConfigImpl.java | 2 +- .../server/state/alert/AlertDefinitionHash.java | 2 - .../server/state/cluster/ClusterImpl.java | 2 +- .../state/configgroup/ConfigGroupFactory.java | 15 +----- .../state/configgroup/ConfigGroupImpl.java | 8 --- .../server/state/fsm/StateMachineFactory.java | 4 +- .../state/repository/VersionDefinitionXml.java | 1 - .../state/services/MetricsRetrievalService.java | 6 +-- .../state/stack/upgrade/HostOrderGrouping.java | 1 - .../server/state/stack/upgrade/TaskWrapper.java | 8 +-- .../server/upgrade/UpgradeCatalog300.java | 2 +- .../server/api/query/JpaSortBuilderTest.java | 4 -- .../apache/ambari/server/events/EventsTest.java | 4 -- .../apache/ambari/server/orm/OrmTestHelper.java | 8 --- .../server/orm/dao/HostRoleCommandDAOTest.java | 2 - .../state/alerts/AlertDefinitionHashTest.java | 2 +- .../state/alerts/AlertEventPublisherTest.java | 3 -- .../state/alerts/InitialAlertEventTest.java | 3 -- .../server/state/cluster/ClusterTest.java | 2 +- ...omponentHostConcurrentWriteDeadlockTest.java | 4 -- 46 files changed, 43 insertions(+), 159 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/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 a46e6a2..574afa1 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 @@ -811,7 +811,7 @@ public class Stage { /** * This method should be used only in stage planner. To add * a new execution command use - * {@link #addHostRoleExecutionCommand(String, org.apache.ambari.server.Role, org.apache.ambari.server.RoleCommand, org.apache.ambari.server.state.ServiceComponentHostEvent, String, String, boolean)} + * {@link #addHostRoleExecutionCommand(String, Role, RoleCommand, ServiceComponentHostEvent, String, String, boolean, boolean)} * @param origStage the stage * @param hostname the hostname; {@code null} for a server-side stage * @param r the role http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/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 43c484c..0cfc68d 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 @@ -138,9 +138,6 @@ public class HeartBeatResponse { /** * Gets the alert definition commands that contain the alert definitions for * each cluster that the host is a member of. - * - * @param commands - * the commands, or {@code null} for none. */ public List<AlertDefinitionCommand> getAlertDefinitionCommands() { return alertDefinitionCommands; http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java b/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java index 6d76945..dffc73b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/query/JpaSortBuilder.java @@ -56,7 +56,7 @@ public class JpaSortBuilder<T> { * Builds the list of sort orders based on the supplied request and JPA * predicate visitor. * - * @param sortRequests + * @param sortRequest * the Ambari sort request properties to turn into a JPA sort * request. If {@code null} or the {@link SortRequestProperty} list * is null, an empty list is returned. http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java index 6de5e25..dfbefd7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/resources/RequestScheduleResourceDefinition.java @@ -25,11 +25,7 @@ import org.apache.ambari.server.api.util.TreeNode; import org.apache.ambari.server.controller.spi.Resource; public class RequestScheduleResourceDefinition extends BaseResourceDefinition { - /** - * Constructor. - * - * @param resourceType resource type - */ + public RequestScheduleResourceDefinition() { super(Resource.Type.RequestSchedule); } http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java index 4aad530..3250a3b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/rest/BootStrapResource.java @@ -100,7 +100,7 @@ public class BootStrapResource { /** * Gets a list of bootstrapped hosts. * - * @param info the host info, with no SSL key information + * @param uriInfo the host info, with no SSL key information */ @GET @Path("/hosts") http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java index d3f88ec..fb5423b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AlertDefinitionService.java @@ -99,9 +99,6 @@ public class AlertDefinitionService extends BaseService { /** * Create a request schedule resource instance - * @param clusterName - * @param requestScheduleId - * @return */ private ResourceInstance createResourceInstance(String clusterName, Long definitionId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java index 05f3e91..273bdaa 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/ServicesUpCheck.java @@ -195,8 +195,6 @@ public class ServicesUpCheck extends AbstractCheckDescriptor { * purposes of this check. Component type, maintenance mode, and state are * taken into account. * - * @param clusters - * the clusters instance * @param cluster * the cluster * @param serviceComponent http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java index 6f592f0..55a4f50 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/configuration/Configuration.java @@ -570,7 +570,7 @@ public class Configuration { "security.server.key_name", "ca.key"); /** - * The name of the keystore file, located in {@link SRVR_KSTR_DIR}. + * The name of the keystore file, located in {@link #SRVR_KSTR_DIR}. */ @Markdown(description = "The name of the keystore file, located in `security.server.keys_dir`") public static final ConfigurationProperty<String> KSTR_NAME = new ConfigurationProperty<>( @@ -588,7 +588,7 @@ public class Configuration { /** * The name of the truststore file ambari uses to store trusted certificates. - * Located in {@link SRVR_KSTR_DIR}. + * Located in {@link #SRVR_KSTR_DIR}. */ @Markdown(description = "The name of the truststore file ambari uses to store trusted certificates. Located in `security.server.keys_dir`") public static final ConfigurationProperty<String> TSTR_NAME = new ConfigurationProperty<>( @@ -1652,7 +1652,7 @@ public class Configuration { "ssl.trustStore.password", null); /** - * The type of truststore used by the {@link JAVAX_SSL_TRUSTSTORE_TYPE} property. + * The type of truststore used by the {@link #JAVAX_SSL_TRUSTSTORE_TYPE} property. */ @Markdown(description = "The type of truststore used by the `javax.net.ssl.trustStoreType` property.") public static final ConfigurationProperty<String> SSL_TRUSTSTORE_TYPE = new ConfigurationProperty<>( @@ -4411,7 +4411,7 @@ public class Configuration { * Caching of host role command status summary can be enabled/disabled * through the {@link #SERVER_HRC_STATUS_SUMMARY_CACHE_ENABLED} config property. * This method returns the value of {@link #SERVER_HRC_STATUS_SUMMARY_CACHE_ENABLED} - * config property. If this config property is not defined than returns the default defined by {@link #SERVER_HRC_STATUS_SUMMARY_CACHE_ENABLED_DEFAULT}. + * config property. * @return true if caching is to be enabled otherwise false. */ public boolean getHostRoleCommandStatusSummaryCacheEnabled() { @@ -4433,8 +4433,7 @@ public class Configuration { * In order to avoid the cache storing host role command status summary objects exhaust * memory we set a max record number allowed for the cache. This limit can be configured * through {@link #SERVER_HRC_STATUS_SUMMARY_CACHE_SIZE} config property. The method returns - * the value of this config property. If this config property is not defined than - * the default value specified by {@link #SERVER_HRC_STATUS_SUMMARY_CACHE_SIZE_DEFAULT} is returned. + * the value of this config property. * @return the upper limit for the number of cached host role command summaries. */ public long getHostRoleCommandStatusSummaryCacheSize() { @@ -4455,8 +4454,7 @@ public class Configuration { /** * As a safety measure the cache storing host role command status summaries should auto expire after a while. * The expiry duration is specified through the {@link #SERVER_HRC_STATUS_SUMMARY_CACHE_EXPIRY_DURATION} config property - * expressed in minutes. The method returns the value of this config property. If this config property is not defined than - * the default value specified by {@link #SERVER_HRC_STATUS_SUMMARY_CACHE_EXPIRY_DURATION_DEFAULT} + * expressed in minutes. The method returns the value of this config property. * @return the cache expiry duration in minutes */ public long getHostRoleCommandStatusSummaryCacheExpiryDuration() { @@ -4757,7 +4755,7 @@ public class Configuration { /** * Get property-providers' timeout value in milliseconds for waiting on the - * completion of submitted {@link Callable}s. This will return {@value 5000} + * completion of submitted {@link Callable}s. This will return 5000 * if not specified. * * @return the property-providers' completion srevice timeout, in millis. @@ -5007,8 +5005,6 @@ public class Configuration { /** * Gets the minimum number of connections that should always exist in the * connection pool. - * - * @return default of {@value #SERVER_JDBC_CONNECTION_POOL_MIN_SIZE} */ public int getConnectionPoolMinimumSize() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_MIN_SIZE)); @@ -5017,8 +5013,6 @@ public class Configuration { /** * Gets the maximum number of connections that should even exist in the * connection pool. - * - * @return default of {@value #SERVER_JDBC_CONNECTION_POOL_MAX_SIZE} */ public int getConnectionPoolMaximumSize() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_MAX_SIZE)); @@ -5028,8 +5022,6 @@ public class Configuration { * Gets the maximum amount of time in seconds any connection, whether its been * idle or active, should even be in the pool. This will terminate the * connection after the expiration age and force new connections to be opened. - * - * @return default of {@value #SERVER_JDBC_CONNECTION_POOL_MAX_AGE} */ public int getConnectionPoolMaximumAge() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_MAX_AGE)); @@ -5039,8 +5031,6 @@ public class Configuration { * Gets the maximum amount of time in seconds that an idle connection can * remain in the pool. This should always be greater than the value returned * from {@link #getConnectionPoolMaximumExcessIdle()} - * - * @return default of {@value #SERVER_JDBC_CONNECTION_POOL_MAX_IDLE_TIME} */ public int getConnectionPoolMaximumIdle() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_MAX_IDLE_TIME)); @@ -5050,9 +5040,6 @@ public class Configuration { * Gets the maximum amount of time in seconds that connections beyond the * minimum pool size should remain in the pool. This should always be less * than than the value returned from {@link #getConnectionPoolMaximumIdle()} - * - * @return default of - * {@value #SERVER_JDBC_CONNECTION_POOL_MAX_IDLE_TIME_EXCESS} */ public int getConnectionPoolMaximumExcessIdle() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_MAX_IDLE_TIME_EXCESS)); @@ -5062,8 +5049,6 @@ public class Configuration { * Gets the number of connections that should be retrieved when the pool size * must increase. It's wise to set this higher than 1 since the assumption is * that a pool that needs to grow should probably grow by more than 1. - * - * @return default of {@value #SERVER_JDBC_CONNECTION_POOL_AQUISITION_SIZE} */ public int getConnectionPoolAcquisitionSize() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_AQUISITION_SIZE)); @@ -5072,9 +5057,6 @@ public class Configuration { /** * Gets the number of times connections should be retried to be acquired from * the database before giving up. - * - * @return default of - * {@value #SERVER_JDBC_CONNECTION_POOL_ACQUISITION_RETRY_ATTEMPTS} */ public int getConnectionPoolAcquisitionRetryAttempts() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_ACQUISITION_RETRY_ATTEMPTS)); @@ -5082,8 +5064,6 @@ public class Configuration { /** * Gets the delay in milliseconds between connection acquire attempts. - * - * @return default of {@value #DEFAULT_JDBC_POOL_ACQUISITION_RETRY_DELAY} */ public int getConnectionPoolAcquisitionRetryDelay() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_ACQUISITION_RETRY_DELAY)); @@ -5093,8 +5073,6 @@ public class Configuration { /** * Gets the number of seconds in between testing each idle connection in the * connection pool for validity. - * - * @return default of {@value #SERVER_JDBC_CONNECTION_POOL_IDLE_TEST_INTERVAL} */ public int getConnectionPoolIdleTestInternval() { return Integer.parseInt(getProperty(SERVER_JDBC_CONNECTION_POOL_IDLE_TEST_INTERVAL)); @@ -5279,9 +5257,6 @@ public class Configuration { /** * Gets the interval at which cached alert data is written out to the * database, if enabled. - * - * @return the cache flush interval, or - * {@value #ALERTS_CACHE_FLUSH_INTERVAL_DEFAULT} if not set. */ @Experimental(feature = ExperimentalFeature.ALERT_CACHING) public int getAlertCacheFlushInterval() { @@ -5290,9 +5265,6 @@ public class Configuration { /** * Gets the size of the alerts cache, if enabled. - * - * @return the cache flush interval, or {@value #ALERTS_CACHE_SIZE_DEFAULT} if - * not set. */ @Experimental(feature = ExperimentalFeature.ALERT_CACHING) public int getAlertCacheSize() { @@ -5435,10 +5407,6 @@ public class Configuration { /** * Gets the core pool size used for the {@link MetricsRetrievalService}. - * - * @return the core pool size or - * {@value #PROCESSOR_BASED_THREADPOOL_MAX_SIZE_DEFAULT} if not - * specified. */ public int getMetricsServiceThreadPoolCoreSize() { return Integer.parseInt(getProperty(METRIC_RETRIEVAL_SERVICE_THREADPOOL_CORE_SIZE)); @@ -5447,11 +5415,7 @@ public class Configuration { /** * Gets the max pool size used for the {@link MetricsRetrievalService}. * Threads will only be increased up to this value of the worker queue is - * exhauseted and rejects the new task. - * - * @return the max pool size, or - * {@value PROCESSOR_BASED_THREADPOOL_MAX_SIZE_DEFAULT} if not - * specified. + * exhausted and rejects the new task. * @see #getMetricsServiceWorkerQueueSize() */ public int getMetricsServiceThreadPoolMaxSize() { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java index 27ac03e..6c4e096 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractProviderModule.java @@ -915,7 +915,7 @@ public abstract class AbstractProviderModule implements ProviderModule, * @param clusterName * the cluster name * @param configType - * the configuration type (for example {@value hdfs-site}). + * the configuration type (for example <code>hdfs-site</code>). * @return */ private String getDesiredConfigVersion(String clusterName, http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java index 511c8fb..b657f03 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeResourceProvider.java @@ -608,8 +608,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider /** * Validates a singular API request. * - * @param requestMap - * the map of properties + * @param upgradeContext the map of properties * @return the validated upgrade pack * @throws AmbariException */ @@ -1650,7 +1649,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider * command was created. For upgrades, this is problematic since the commands * are all created ahead of time, but the upgrade may change configs as part * of the upgrade pack.</li> - * <li>{@link #COMMAND_PARAM_REQUEST_ID}</li> the ID of the request. + * <li>{@link UpgradeContext#COMMAND_PARAM_REQUEST_ID}</li> the ID of the request. * <ul> * * @return the initialized parameter map. http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java index 7914fd9..5f12e52 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/VersionDefinitionResourceProvider.java @@ -589,7 +589,6 @@ public class VersionDefinitionResourceProvider extends AbstractAuthorizedResourc * @param id the definition id * @param xml the version definition xml * @param requestedIds the requested ids - * @param fromAvailable if the resource should include the {@link #SHOW_AVAILABLE} property * @return the resource * @throws SystemException */ http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionDisabledEvent.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionDisabledEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionDisabledEvent.java index a3c6e68..b91253c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionDisabledEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/AlertDefinitionDisabledEvent.java @@ -35,7 +35,7 @@ public class AlertDefinitionDisabledEvent extends ClusterEvent { * * @param clusterId * the ID of the cluster that the definition is in. - * @param definition + * @param definitionId * the alert definition being registered. */ public AlertDefinitionDisabledEvent(long clusterId, long definitionId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/events/jpa/EntityManagerCacheInvalidationEvent.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/jpa/EntityManagerCacheInvalidationEvent.java b/ambari-server/src/main/java/org/apache/ambari/server/events/jpa/EntityManagerCacheInvalidationEvent.java index fe472b2..9c910f7 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/jpa/EntityManagerCacheInvalidationEvent.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/jpa/EntityManagerCacheInvalidationEvent.java @@ -23,11 +23,6 @@ package org.apache.ambari.server.events.jpa; */ public final class EntityManagerCacheInvalidationEvent extends JPAEvent { - /** - * Constructor. - * - * @param eventType - */ public EntityManagerCacheInvalidationEvent() { super(JPAEventType.CACHE_INVALIDATION); } http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java index 907e4d8..2faadba 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/alerts/AlertReceivedListener.java @@ -588,7 +588,7 @@ public class AlertReceivedListener { * the definition to read any repeat tolerance overrides from. * @param state * the state of the {@link AlertCurrentEntity}. - * @param the + * @param occurrences * occurrences of the alert in the current state (used for * calculation firmness when moving between non-OK states) * @return http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java index ae07dc0..bf8ff48 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/DBAccessor.java @@ -531,9 +531,8 @@ public interface DBAccessor { * the name of the table (not {@code null}). * @param columnName * the name of the column to retrieve type for (not {@code null}). - * @return the integer representation of the column type from {@link Types}. + * @return the integer representation of the column type * @throws SQLException - * @see {@link Types} */ int getColumnType(String tableName, String columnName) throws SQLException; http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionDAO.java index 6c6c3ae..4b428d1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionDAO.java @@ -135,7 +135,7 @@ public class ExtensionDAO { /** * Creates or updates the specified entity. This method will check - * {@link ExtensionEntity#getStackId()} in order to determine whether the entity + * {@link ExtensionEntity#getExtensionId()} in order to determine whether the entity * should be created or merged. * * @param extension http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java index e860c64..3df1cd5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ExtensionLinkDAO.java @@ -209,8 +209,7 @@ public class ExtensionLinkDAO { * {@link ExtensionLinkEntity#getLinkId()} in order to determine whether the entity * should be created or merged. * - * @param extension - * the link to create or update (not {@code null}). + * @param link the link to create or update (not {@code null}). */ public void createOrUpdate(ExtensionLinkEntity link) throws AmbariException { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java index 5d53416..8f16cb2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/RequestDAO.java @@ -223,8 +223,8 @@ public class RequestDAO implements Cleanable { * Retrieves from the database for a cluster, or specifically for non-cluster requests. * This method should be considered temporary until Request/Stage/Task cleanup is achieved. * - * @param maxResults the max number to return - * @param ascOrder {@code true} to sort by requestId ascending, {@code false} for descending + * @param limit the max number to return + * @param sortAscending {@code true} to sort by requestId ascending, {@code false} for descending * @param clusterId the cluster to find, or {@code null} to search for requests without cluster */ @RequiresSession http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java index 6337487..0c3d817 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/AlertDefinitionEntity.java @@ -538,7 +538,7 @@ public class AlertDefinitionEntity { * value from {@link #getRepeatTolerance()} should be used to calculate retry * tolerance. * - * @param repeatToleranceEnabled + * @param enabled * {@code true} to override the defautlt value and use the value * returned from {@link #getRepeatTolerance()}. */ http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java index bea1d19..de1454b 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeEntity.java @@ -176,9 +176,6 @@ public class UpgradeEntity { return requestId; } - /** - * @param id the request id - */ public void setRequestEntity(RequestEntity requestEntity) { this.requestEntity = requestEntity; requestId = requestEntity.getRequestId(); http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java index 4830e3b..53a1925 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/UpgradeGroupEntity.java @@ -111,7 +111,7 @@ public class UpgradeGroupEntity { } /** - * @param text the item text + * @param title the item text */ public void setTitle(String title) { groupTitle = title; http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewURLEntity.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewURLEntity.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewURLEntity.java index 27cb8e2..7765a12 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewURLEntity.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ViewURLEntity.java @@ -80,7 +80,6 @@ public class ViewURLEntity { /** * Set the URL suffix - * @param URL suffix */ public void setUrlSuffix(String urlSuffix) { this.urlSuffix = urlSuffix; http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/DbmsHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/DbmsHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/DbmsHelper.java index c2778d3..d374ddc 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/DbmsHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/helpers/dbms/DbmsHelper.java @@ -66,7 +66,6 @@ public interface DbmsHelper { * * @param indexName * @param tableName - * @param columnNames * @return */ String getDropIndexStatement(String indexName, String tableName); http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/LdapServerProperties.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/LdapServerProperties.java b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/LdapServerProperties.java index e06d8f2..4435e98 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/LdapServerProperties.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/security/authorization/LdapServerProperties.java @@ -148,8 +148,8 @@ public class LdapServerProperties { /** * Returns the LDAP filter to search users by. * @param useAlternateUserSearchFilter if true than return LDAP filter that expects user name in - * User Principal Name format to filter users constructed from {@value org.apache.ambari.server.configuration.Configuration#LDAP_ALT_USER_SEARCH_FILTER_KEY}. - * Otherwise the filter is constructed from {@value org.apache.ambari.server.configuration.Configuration#LDAP_USER_SEARCH_FILTER_KEY} + * User Principal Name format to filter users constructed from {@link org.apache.ambari.server.configuration.Configuration#LDAP_ALT_USER_SEARCH_FILTER}. + * Otherwise the filter is constructed from {@link org.apache.ambari.server.configuration.Configuration#LDAP_USER_SEARCH_FILTER} * @return the LDAP filter string */ public String getUserSearchFilter(boolean useAlternateUserSearchFilter) { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java index dfe7072..d3ad351 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/stack/StackModule.java @@ -1046,7 +1046,7 @@ public class StackModule extends BaseModule<StackModule, StackInfo> implements V * Finds an upgrade pack that: * <ul> * <li>Is found in the $SERVICENAME/upgrades/$STACKNAME folder</li> - * <li>Matches the same {@link UpgradeType#getType()}as the {@code base} upgrade pack</li> + * <li>Matches the same {@link UpgradeType} as the {@code base} upgrade pack</li> * <li>Has the {@link UpgradePack#getTarget()} value equals to "*"</li> * <li>Has the {@link UpgradePack#getTargetStack()} value equals to "*"</li> * </ul> http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java b/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java index c961995..49fc8c0 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/Cluster.java @@ -695,8 +695,7 @@ public interface Cluster { * Gets whether there is an upgrade which has been suspended and not yet * finalized. * - * @return {@code true} if the last upgrade is in the - * {@link UpgradeState#SUSPENDED}. + * @return {@code true} if the last upgrade is suspended */ boolean isUpgradeSuspended(); http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java index 543dadd..0e40254 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigImpl.java @@ -52,7 +52,7 @@ public class ConfigImpl implements Config { private final static Logger LOG = LoggerFactory.getLogger(ConfigImpl.class); /** - * A label for {@link #hostLock} to use with the {@link LockFactory}. + * A label for {@link #propertyLock} to use with the {@link LockFactory}. */ private static final String PROPERTY_LOCK_LABEL = "configurationPropertyLock"; http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java index 616bcdb..5896819 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertDefinitionHash.java @@ -447,8 +447,6 @@ public class AlertDefinitionHash { * * @param clusterId * the ID of the cluster. - * @param hosts - * the hosts to push {@link AlertDefinitionCommand}s for. */ public void enqueueAgentCommands(long clusterId) { String clusterName = null; http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java index b7cc4cd..b86c5cd 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/cluster/ClusterImpl.java @@ -3151,7 +3151,7 @@ public class ClusterImpl implements Cluster { * should make sure the cluster global write lock is acquired. * * @param stackId - * @see Cluster#getClusterGlobalLock() + * @see #clusterGlobalLock */ @Transactional void removeAllConfigsForStack(StackId stackId) { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupFactory.java index 906d948..2209dc1 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupFactory.java @@ -29,26 +29,13 @@ import com.google.inject.assistedinject.Assisted; public interface ConfigGroupFactory { /** * Creates and saves a new {@link ConfigGroup}. - * - * @param cluster - * @param name - * @param tag - * @param description - * @param configs - * @param hosts - * @param serviceName - * @return */ ConfigGroup createNew(@Assisted("cluster") Cluster cluster, @Assisted("name") String name, @Assisted("tag") String tag, @Assisted("description") String description, @Assisted("configs") Map<String, Config> configs, @Assisted("hosts") Map<Long, Host> hosts); /** - * Instantiates a {@link ConfigGroup} fron an existing, persisted entity. - * - * @param cluster - * @param entity - * @return + * Instantiates a {@link ConfigGroup} from an existing, persisted entity. */ ConfigGroup createExisting(Cluster cluster, ConfigGroupEntity entity); } http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java index 89a03aa..a74e2a2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/configgroup/ConfigGroupImpl.java @@ -258,7 +258,6 @@ public class ConfigGroupImpl implements ConfigGroup { /** * Helper method to recreate configs mapping - * @param configs */ @Override public void setConfigurations(Map<String, Config> configurations) { @@ -349,10 +348,6 @@ public class ConfigGroupImpl implements ConfigGroup { /** * Replaces all existing host mappings with the new collection of hosts. - * - * @param the - * new hosts - * @throws Exception */ @Transactional void replaceHostMappings(Map<Long, Host> hosts) { @@ -370,9 +365,6 @@ public class ConfigGroupImpl implements ConfigGroup { /** * Adds the collection of hosts to the configuration group. - * - * @param hostEntity - * @param configGroupEntity */ @Transactional ConfigGroupEntity persistHostMapping(Collection<Host> hosts, http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java index cc57f2c..1a17a25 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/fsm/StateMachineFactory.java @@ -273,9 +273,9 @@ final public class StateMachineFactory /** * Effect a transition due to the effecting stimulus. - * @param state current state + * @param oldState current state * @param eventType trigger to initiate the transition - * @param cause causal eventType context + * @param event causal eventType context * @return transitioned state */ private STATE doTransition http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java index 69399d6..15693a2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/repository/VersionDefinitionXml.java @@ -353,7 +353,6 @@ public class VersionDefinitionXml { /** * Builds a Version Definition that is the default for the stack - * @param stack * @return the version definition */ public static VersionDefinitionXml build(StackInfo stackInfo) { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java b/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java index 59ec15b..ec6b074 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/services/MetricsRetrievalService.java @@ -281,7 +281,7 @@ public class MetricsRetrievalService extends AbstractService { * @param streamProvider * the {@link StreamProvider} to use to read from the remote * endpoint. - * @param jmxUrl + * @param url * the URL to read from * * @see #getCachedJMXMetric(String) @@ -399,7 +399,7 @@ public class MetricsRetrievalService extends AbstractService { * the URLs which are currently waiting to be processed. This * method will remove the specified URL from this {@link Set} when * it completes (successful or not). - * @param m_ttlUrlCache + * @param ttlUrlCache * an evicting cache which is used to determine if a request for a * metric is too soon after the last request, or {@code null} if * requests can be made sequentially without any separation. @@ -501,7 +501,7 @@ public class MetricsRetrievalService extends AbstractService { * * @param throwable * @param url - * @return the key, such as {@value IOException-http://www.server.com/jmx}. + * @return the key, such as <code>IOException-http://www.server.com/jmx</code>. */ private String buildCacheKey(Throwable throwable, String url) { if (null == throwable || null == url) { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java index 97864a6..d19406e 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/HostOrderGrouping.java @@ -287,7 +287,6 @@ public class HostOrderGrouping extends Grouping { /** * @param upgradeContext the context - * @param hosts the list of hostnames * @return the wrappers for a host */ private List<StageWrapper> buildServiceChecks(UpgradeContext upgradeContext, List<String> serviceChecks) { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapper.java index dfa6159..25b8a93 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/TaskWrapper.java @@ -42,10 +42,10 @@ public class TaskWrapper { private Set<String> timeoutKeys = new HashSet<>(); /** - * @param s the service name for the tasks - * @param c the component name for the tasks - * @param hosts the set of hosts that the tasks are for - * @param tasks an array of tasks as a convenience + * @param s the service name for the task + * @param c the component name for the task + * @param hosts the set of hosts that the task is for + * @param task a single task */ public TaskWrapper(String s, String c, Set<String> hosts, Task task) { this(s, c, hosts, null, task); http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java index 8a4afe9..633d837 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/upgrade/UpgradeCatalog300.java @@ -208,7 +208,7 @@ public class UpgradeCatalog300 extends AbstractUpgradeCatalog { * <ul> * <li>Adds the {@link #CLUSTER_CONFIG_SELECTED_COLUMN} to * {@link #CLUSTER_CONFIG_TABLE}. - * <li>Adds the {@link #CLUSTER_CONFIG_SELECTED_TIMESTAMP} to + * <li>Adds the {@link #CLUSTER_CONFIG_SELECTED_TIMESTAMP_COLUMN} to * {@link #CLUSTER_CONFIG_TABLE}. * </ul> */ http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java index 394de9f..ec60966 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/api/query/JpaSortBuilderTest.java @@ -126,10 +126,6 @@ public class JpaSortBuilderTest { Assert.assertEquals(1, roots.size()); } - /** - * The {@link HistoryPredicateVisitor} is used to convert an Ambari - * {@link Predicate} into a JPA {@link javax.persistence.criteria.Predicate}. - */ private final class MockAlertHistoryredicateVisitor extends JpaPredicateVisitor<AlertHistoryEntity> { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java b/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java index 98510db..6fb0028 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/events/EventsTest.java @@ -376,10 +376,6 @@ public class EventsTest { Assert.assertEquals(AmbariEventType.CLUSTER_RENAME, ambariEvents.get(0).getType()); } - /** - * Calls {@link Service#persist()} to mock a service install along with - * creating a single {@link Host} and {@link ServiceComponentHost}. - */ private void installHdfsService() throws Exception { String serviceName = "HDFS"; Service service = m_serviceFactory.createNew(m_cluster, serviceName); http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java index 8e50b5f..fdc19d1 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/OrmTestHelper.java @@ -431,10 +431,6 @@ public class OrmTestHelper { serviceComponentHost.setDesiredState(State.INSTALLED); } - /** - * Calls {@link Service#persist()} to mock a service install along with - * creating a single {@link Host} and {@link ServiceComponentHost}. - */ public void installHdfsService(Cluster cluster, ServiceFactory serviceFactory, ServiceComponentFactory componentFactory, ServiceComponentHostFactory schFactory, String hostName) throws Exception { @@ -469,10 +465,6 @@ public class OrmTestHelper { sch.setStackVersion(new StackId("HDP-2.0.6")); } - /** - * Calls {@link Service#persist()} to mock a service install along with - * creating a single {@link Host} and {@link ServiceComponentHost}. - */ public void installYarnService(Cluster cluster, ServiceFactory serviceFactory, ServiceComponentFactory componentFactory, ServiceComponentHostFactory schFactory, String hostName) throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java index d5fa793..f6f3269 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/orm/dao/HostRoleCommandDAOTest.java @@ -175,8 +175,6 @@ public class HostRoleCommandDAOTest { * @param hostEntity * @param requestEntity * @param status - * @param skipStage - * @param supportsAutoSkipOnFailure * @return */ private void createStage(long startStageId, int count, HostEntity hostEntity, http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java index 62fc19e..838cd6b 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertDefinitionHashTest.java @@ -275,7 +275,7 @@ public class AlertDefinitionHashTest extends TestCase { } /** - * Test {@link AlertDefinitionHash#isHashCached(String)}. + * Test {@link AlertDefinitionHash#isHashCached(String,String)}. */ @Test public void testIsHashCached() { http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java index e50dba5..8c23b69 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/AlertEventPublisherTest.java @@ -300,9 +300,6 @@ public class AlertEventPublisherTest { source.getAlertName())); } - /** - * Calls {@link Service#persist()} to mock a service install. - */ private void installHdfsService() throws Exception { String serviceName = "HDFS"; Service service = serviceFactory.createNew(cluster, serviceName); http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java index 483aac5..890464d 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/alerts/InitialAlertEventTest.java @@ -173,9 +173,6 @@ public class InitialAlertEventTest { m_listener.getAlertEventReceivedCount(InitialAlertEvent.class)); } - /** - * Calls {@link Service#persist()} to mock a service install. - */ private void installHdfsService() throws Exception { String serviceName = "HDFS"; Service service = m_serviceFactory.createNew(m_cluster, serviceName); http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java index 345c463..76689f4 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ClusterTest.java @@ -1638,7 +1638,7 @@ public class ClusterTest { * Tests that hosts can be correctly transitioned into the "INSTALLING" state. * This method also tests that hosts in MM will not be transitioned, as per * the contract of - * {@link Cluster#transitionHostsToInstalling(ClusterVersionEntity)}. + * {@link Cluster#transitionHosts(ClusterVersionEntity, RepositoryVersionState)}. * * @throws Exception */ http://git-wip-us.apache.org/repos/asf/ambari/blob/893f97e4/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java index e13dd70..8f37ad7 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/state/cluster/ServiceComponentHostConcurrentWriteDeadlockTest.java @@ -181,10 +181,6 @@ public class ServiceComponentHostConcurrentWriteDeadlockTest { private static final class ServiceComponentHostDeadlockWriter extends Thread { private List<ServiceComponentHost> serviceComponentHosts; - /** - * @param nameNodeSCH - * the nameNodeSCH to set - */ public void setServiceComponentHosts(List<ServiceComponentHost> serviceComponentHosts) { this.serviceComponentHosts = serviceComponentHosts; }