Repository: ambari Updated Branches: refs/heads/trunk e71f49e4e -> 2ff48a00b
AMBARI-21185. False positive unused import for nested class referenced only in Javadoc Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2ff48a00 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2ff48a00 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2ff48a00 Branch: refs/heads/trunk Commit: 2ff48a00b155a65ac0daa55ac8f8be00774b158f Parents: e71f49e Author: Attila Doroszlai <adorosz...@hortonworks.com> Authored: Tue Jun 6 17:05:21 2017 +0200 Committer: Attila Doroszlai <adorosz...@hortonworks.com> Committed: Thu Jun 8 11:35:49 2017 +0200 ---------------------------------------------------------------------- .../controller/AmbariCustomCommandExecutionHelper.java | 7 +++---- .../apache/ambari/server/controller/KerberosHelperImpl.java | 2 -- .../server/controller/internal/UpgradeResourceProvider.java | 5 ----- .../listeners/upgrade/HostVersionOutOfSyncListener.java | 2 -- .../org/apache/ambari/server/orm/dao/HostVersionDAO.java | 6 ++---- .../org/apache/ambari/server/orm/dao/ServiceConfigDAO.java | 1 - .../server/serveraction/upgrades/FinalizeUpgradeAction.java | 2 -- .../main/java/org/apache/ambari/server/state/Cluster.java | 6 +----- .../java/org/apache/ambari/server/state/ConfigFactory.java | 8 -------- .../java/org/apache/ambari/server/state/UpgradeContext.java | 2 -- .../java/org/apache/ambari/server/state/alert/AlertUri.java | 2 +- .../server/state/stack/upgrade/RepositoryVersionHelper.java | 4 +--- .../internal/StackUpgradeConfigurationMergeTest.java | 3 +-- .../controller/internal/UpgradeResourceProviderTest.java | 2 +- .../java/org/apache/ambari/server/orm/OrmTestHelper.java | 2 -- .../server/serveraction/upgrades/ConfigureActionTest.java | 5 ----- .../server/serveraction/upgrades/UpgradeActionTest.java | 5 ----- .../org/apache/ambari/server/state/cluster/ClusterTest.java | 4 ++-- .../apache/ambari/server/upgrade/UpgradeCatalogHelper.java | 7 ------- 19 files changed, 12 insertions(+), 63 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java index cabb9d6..554ae1d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariCustomCommandExecutionHelper.java @@ -1180,7 +1180,7 @@ public class AmbariCustomCommandExecutionHelper { * * @return the repo info * - * @deprecated use {@link #getCommandRepository(Cluster, Host)} instead. + * @deprecated use {@link #getCommandRepository(Cluster, ServiceComponent, Host)} instead. * @throws AmbariException if the repository information can not be obtained */ @Deprecated @@ -1305,7 +1305,7 @@ public class AmbariCustomCommandExecutionHelper { /** * Executed by two different representations of repos. When we are comfortable with the new - * implemenation, this may be removed and called inline in {@link #getCommandRepository(Cluster, Host)} + * implementation, this may be removed and called inline in {@link #getCommandRepository(Cluster, ServiceComponent, Host)} * * @param cluster the cluster to isolate the stack * @param component the component @@ -1390,9 +1390,8 @@ public class AmbariCustomCommandExecutionHelper { * * @param actionExecContext the context * @param cluster the cluster for the command - * @param stackId the effective stack id to use. * - * @return a wrapper of the imporant JSON structures to add to a stage + * @return a wrapper of the important JSON structures to add to a stage */ public ExecuteCommandJson getCommandJson(ActionExecutionContext actionExecContext, Cluster cluster, RepositoryVersionEntity repositoryVersion) throws AmbariException { http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java index 7b6ac7e..87c826d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/KerberosHelperImpl.java @@ -2205,7 +2205,6 @@ public class KerberosHelperImpl implements KerberosHelper { * @param cluster the relevant Cluster * @param requestId the relevant request Id * @param requestContext a String describing the stage - * @param clusterHostInfo JSON-encoded clusterHostInfo structure * @param commandParams JSON-encoded command parameters * @param hostParams JSON-encoded host parameters * @return a newly created Stage @@ -2233,7 +2232,6 @@ public class KerberosHelperImpl implements KerberosHelper { * @param cluster the relevant Cluster * @param requestId the relevant request Id * @param requestContext a String describing the stage - * @param clusterHostInfo JSON-encoded clusterHostInfo structure * @param commandParams JSON-encoded command parameters * @param hostParams JSON-encoded host parameters * @param actionClass The ServeAction class that implements the action to invoke http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/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 f8f8faa..60665f7 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 @@ -1089,8 +1089,6 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider * @param request upgrade request * @param entity a single of upgrade * @param task server-side task (if any) - * @param skippable if user can skip stage on failure - * @param allowRetry if user can retry running stage on failure * @param configUpgradePack a runtime-generated config upgrade pack that * contains all config change definitions from all stacks involved into * upgrade @@ -1453,9 +1451,6 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider /** * Constructor. - * - * @param from - * @param target */ public RepositoryVersions(RepositoryVersionEntity from, RepositoryVersionEntity to) { fromRepositoryId = from.getId(); http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java index 5536ef9..2eb89a2 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/events/listeners/upgrade/HostVersionOutOfSyncListener.java @@ -64,8 +64,6 @@ import com.google.inject.persist.Transactional; * handles {@link org.apache.ambari.server.events.ServiceInstalledEvent} and * {@link org.apache.ambari.server.events.ServiceComponentInstalledEvent} * to update {@link org.apache.ambari.server.state.RepositoryVersionState} - * - * @see org.apache.ambari.server.state.Cluster#recalculateClusterVersionState(RepositoryVersionEntity) */ @Singleton @EagerSingleton http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java index ad34ec7..c05b06d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/HostVersionDAO.java @@ -40,7 +40,7 @@ import com.google.inject.persist.Transactional; * The {@link org.apache.ambari.server.orm.dao.HostVersionDAO} class manages the {@link org.apache.ambari.server.orm.entities.HostVersionEntity} * instances associated with a host. Each host can have multiple stack versions in {@link org.apache.ambari.server.state.RepositoryVersionState#INSTALLED} * which are installed, exactly one stack version that is either {@link org.apache.ambari.server.state.RepositoryVersionState#CURRENT} or - * {@link org.apache.ambari.server.state.RepositoryVersionState#UPGRADING}. + * {@link org.apache.ambari.server.state.RepositoryVersionState#INSTALLING}. */ @Singleton public class HostVersionDAO extends CrudDAO<HostVersionEntity, Long> { @@ -150,9 +150,7 @@ public class HostVersionDAO extends CrudDAO<HostVersionEntity, Long> { /** * Retrieve the single host version for the given cluster, stack name, stack * version, and host name. <br/> - * This query is slow and not suitable for frequent use. <br/> - * Please, use {@link HostVersionDAO#findByClusterStackVersionAndHost(long, org.apache.ambari.server.state.StackId, java.lang.String, long)} <br/> - * It is ~50 times faster + * This query is slow and not suitable for frequent use. * * @param clusterName * Cluster name http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java index 72666e5..6bfad54 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/orm/dao/ServiceConfigDAO.java @@ -153,7 +153,6 @@ public class ServiceConfigDAO { * the cluster (not {@code null}). * @param stackId * the stack (not {@code null}). - * @param service * @return all service configurations for the cluster and stack. */ @RequiresSession http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java index 475a8c9..db0da9c 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/upgrades/FinalizeUpgradeAction.java @@ -95,8 +95,6 @@ public class FinalizeUpgradeAction extends AbstractUpgradeServerAction { /** * Execution path for upgrade. - * @param clusterName the name of the cluster the upgrade is for - * @param version the target version of the upgrade * @return the command report */ private CommandReport finalizeUpgrade(UpgradeContext upgradeContext) http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/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 4fddd8d..b4ebcd8 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 @@ -179,11 +179,7 @@ public interface Cluster { * hosts into the correct state (which may not be * {@link RepositoryVersionState#INSTALLING}). * <p/> - * The difference between this method compared to - * {@link Cluster#mapHostVersions} is that it affects all hosts (not only - * missing hosts). - * <p/> - * Hosts that are in maintenance mode will be transititioned directly into + * Hosts that are in maintenance mode will be transitioned directly into * {@link RepositoryVersionState#OUT_OF_SYNC} instead. Hosts which do not need * the version distributed to them will move into the * {@link RepositoryVersionState#NOT_REQUIRED} state. http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigFactory.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigFactory.java b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigFactory.java index dda5c9c..2879345 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigFactory.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/ConfigFactory.java @@ -32,14 +32,6 @@ public interface ConfigFactory { /** * Creates a new {@link Config} object using provided values. - * - * @param cluster - * @param stackId - * @param type - * @param tag - * @param map - * @param mapAttributes - * @return */ @Experimental(feature = ExperimentalFeature.MULTI_SERVICE, comment = "This constructor is only used for test compatibility and should be removed") http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java index 67ffefd..3ecf64d 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/UpgradeContext.java @@ -397,8 +397,6 @@ public class UpgradeContext { * the cluster that the upgrade is for * @param upgradeEntity * the upgrade entity - * @param repoVersionDAO - * the repository version DAO. */ @AssistedInject public UpgradeContext(@Assisted Cluster cluster, @Assisted UpgradeEntity upgradeEntity, http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertUri.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertUri.java b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertUri.java index 2df1dae..8223db5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertUri.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/alert/AlertUri.java @@ -83,7 +83,7 @@ public class AlertUri { /** * If present, then the component supports HA mode and the properties * contained within need to be checked to see if an HA URI is required to be - * constructed instead of using {@link #m_httpProperty} and + * constructed instead of using {@link #m_httpUri}, {@link #m_httpsUri} and * {@link #m_httpsProperty}. */ @SerializedName("high_availability") http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java index 802c876..471e30f 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/RepositoryVersionHelper.java @@ -244,10 +244,8 @@ public class RepositoryVersionHelper { * @param amc the management controller. Tests don't use the same instance that gets injected. * @param repoVersion the repository version * @param osFamily the os family - * @param services the set of services to check for packages - * @param repos the list of individual repositories + * @param servicesOnHost the set of services to check for packages * @return a Map<String, String> to use in - * @throws SystemException */ public Map<String, String> buildRoleParams(AmbariManagementController amc, RepositoryVersionEntity repoVersion, String osFamily, Set<String> servicesOnHost) throws SystemException { http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java index 97b94c3..a37e4f5 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StackUpgradeConfigurationMergeTest.java @@ -69,7 +69,6 @@ import org.apache.ambari.server.state.UpgradeHelper; import org.apache.ambari.server.state.configgroup.ConfigGroupFactory; import org.apache.ambari.server.state.scheduler.RequestExecutionFactory; import org.apache.ambari.server.state.stack.OsFamily; -import org.apache.ambari.server.state.stack.UpgradePack; import org.apache.ambari.server.state.stack.upgrade.Direction; import org.apache.ambari.server.state.stack.upgrade.UpgradeType; import org.easymock.Capture; @@ -91,7 +90,7 @@ import com.google.inject.assistedinject.FactoryModuleBuilder; /** * Tests that - * {@link UpgradeResourceProvider#applyStackAndProcessConfigurations(String, Cluster, String, Direction, UpgradePack, String)} + * {@link UpgradeHelper#updateDesiredRepositoriesAndConfigs} * works correctly. */ public class StackUpgradeConfigurationMergeTest extends EasyMockSupport { http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java index 8f59c07..014ab42 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UpgradeResourceProviderTest.java @@ -1658,7 +1658,7 @@ public class UpgradeResourceProviderTest extends EasyMockSupport { } /** - * Tests that commands created for {@link StageWrapper.Type#RU_TASKS} set the + * Tests that commands created for {@link org.apache.ambari.server.state.stack.upgrade.StageWrapper.Type#RU_TASKS} set the * service and component on the {@link ExecutionCommand}. * <p/> * Without this, commands of this type would not be able to determine which http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/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 eff6a9a..550cc9f 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 @@ -618,8 +618,6 @@ public class OrmTestHelper { * Convenient method to create or to get repository version for given cluster. The repository * version string is based on the cluster's stack version. * - * @param stackId stack object - * @param version stack version * @return repository version */ public RepositoryVersionEntity getOrCreateRepositoryVersion(Cluster cluster) { http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java index 478b126..8ebff2c 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/ConfigureActionTest.java @@ -1793,11 +1793,6 @@ public class ConfigureActionTest { /** * Creates an upgrade and associates it with the cluster. - * - * @param cluster - * @param sourceRepo - * @param targetRepo - * @throws Exception */ private UpgradeEntity createUpgrade(Cluster cluster, RepositoryVersionEntity repositoryVersion) throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java index b6fa6d2..115b25f 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/serveraction/upgrades/UpgradeActionTest.java @@ -565,11 +565,6 @@ public class UpgradeActionTest { /** * Creates an upgrade and associates it with the cluster. - * - * @param cluster - * @param sourceRepo - * @param targetRepo - * @throws Exception */ private UpgradeEntity createUpgrade(Cluster cluster, RepositoryVersionEntity repositoryVersion) throws Exception { http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/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 336db36..6423164 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 @@ -1519,7 +1519,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, RepositoryVersionEntity, org.apache.ambari.server.state.repository.VersionDefinitionXml, boolean)}. + * {@link Cluster#transitionHostsToInstalling(RepositoryVersionEntity, org.apache.ambari.server.state.repository.VersionDefinitionXml, boolean)}. * * @throws Exception */ @@ -2072,7 +2072,7 @@ public class ClusterTest { } /** - * Tests that {@link Cluster#applyLatestConfigurations(StackId)} sets the + * Tests that {@link Cluster#applyLatestConfigurations(StackId, String)} sets the * right configs to enabled when setting them to a prior stack which has * several configs. * http://git-wip-us.apache.org/repos/asf/ambari/blob/2ff48a00/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogHelper.java ---------------------------------------------------------------------- diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogHelper.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogHelper.java index 1a9eed4..58d4c3e 100644 --- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogHelper.java +++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalogHelper.java @@ -168,13 +168,6 @@ public class UpgradeCatalogHelper { /** * Adds a host component for a given service and host. - * - * @param injector - * @param clusterEntity - * @param clusterServiceEntity - * @param hostEntity - * @param componentName - * @param repositoryversion */ @Transactional protected void addComponent(Injector injector, ClusterEntity clusterEntity,