You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mr...@apache.org on 2018/01/23 22:42:30 UTC
[ambari] 02/02: Fix compilation issues after trunk merge
(mradhakrishnan)
This is an automated email from the ASF dual-hosted git repository.
mradhakrishnan pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 687f54ecbc2e7d9cf64144e24be6a4a4ef50b9b3
Author: Madhuvanthi Radhakrishnan <mr...@hortonworks.com>
AuthorDate: Tue Jan 23 14:40:53 2018 -0800
Fix compilation issues after trunk merge (mradhakrishnan)
---
.../java/org/apache/ambari/server/controller/AmbariServer.java | 2 +-
.../server/controller/internal/MpackResourceProvider.java | 2 +-
.../controller/internal/RegistryAdvisorResourceProvider.java | 2 +-
.../controller/internal/RegistryMpackResourceProvider.java | 2 +-
.../internal/RegistryMpackVersionResourceProvider.java | 2 +-
.../server/controller/internal/RegistryResourceProvider.java | 2 +-
.../controller/internal/RegistryScenarioResourceProvider.java | 2 +-
.../internal/RootClusterSettingsResourceProvider.java | 2 +-
.../events/listeners/upgrade/HostVersionOutOfSyncListener.java | 8 ++++----
.../org/apache/ambari/server/state/cluster/ClusterImpl.java | 1 -
.../apache/ambari/server/controller/KerberosHelperTest.java | 2 +-
.../server/controller/internal/UserResourceProviderTest.java | 10 ++++++----
.../apache/ambari/server/upgrade/UpgradeCatalog300Test.java | 2 +-
13 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
index d6147a2..9de89ee 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariServer.java
@@ -93,8 +93,8 @@ import org.apache.ambari.server.orm.dao.ResourceDAO;
import org.apache.ambari.server.orm.dao.UserDAO;
import org.apache.ambari.server.orm.dao.ViewInstanceDAO;
import org.apache.ambari.server.orm.entities.MetainfoEntity;
-import org.apache.ambari.server.registry.RegistryAdvisor;
import org.apache.ambari.server.orm.entities.UserEntity;
+import org.apache.ambari.server.registry.RegistryAdvisor;
import org.apache.ambari.server.resources.ResourceManager;
import org.apache.ambari.server.resources.api.rest.GetResource;
import org.apache.ambari.server.scheduler.ExecutionScheduleManager;
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
index 84babef..0a9ca52 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java
@@ -120,7 +120,7 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider {
}
MpackResourceProvider(AmbariManagementController controller) {
- super(PROPERTY_IDS, KEY_PROPERTY_IDS, controller);
+ super(Resource.Type.Mpack, PROPERTY_IDS, KEY_PROPERTY_IDS, controller);
}
@Override
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryAdvisorResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryAdvisorResourceProvider.java
index 9a6b791..ead0d08 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryAdvisorResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryAdvisorResourceProvider.java
@@ -63,7 +63,7 @@ public abstract class RegistryAdvisorResourceProvider extends AbstractController
*/
protected RegistryAdvisorResourceProvider(Set<String> propertyIds, Map<Resource.Type, String> keyPropertyIds,
AmbariManagementController managementController) {
- super(propertyIds, keyPropertyIds, managementController);
+ super(Resource.Type.Registry, propertyIds, keyPropertyIds, managementController);
}
/**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java
index c0212ea..2e1c23c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackResourceProvider.java
@@ -86,7 +86,7 @@ public class RegistryMpackResourceProvider extends AbstractControllerResourcePro
* @param managementController the management controller
*/
protected RegistryMpackResourceProvider(final AmbariManagementController managementController) {
- super(PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
+ super(Resource.Type.RegistryMpack, PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
}
/**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackVersionResourceProvider.java
index 9020146..4b5393d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryMpackVersionResourceProvider.java
@@ -114,7 +114,7 @@ public class RegistryMpackVersionResourceProvider extends AbstractControllerReso
* @param managementController the management controller
*/
protected RegistryMpackVersionResourceProvider(final AmbariManagementController managementController) {
- super(PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
+ super(Resource.Type.RegistryMpackVersion, PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
resourceCount = 0;
}
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryResourceProvider.java
index 0ec6e66..0822199 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryResourceProvider.java
@@ -89,7 +89,7 @@ public class RegistryResourceProvider extends AbstractControllerResourceProvider
*/
protected RegistryResourceProvider(
final AmbariManagementController managementController) {
- super(PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
+ super(Resource.Type.Registry, PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
}
@Override
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryScenarioResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryScenarioResourceProvider.java
index 4edff07..b0cd588 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryScenarioResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RegistryScenarioResourceProvider.java
@@ -84,7 +84,7 @@ public class RegistryScenarioResourceProvider extends AbstractControllerResource
* @param managementController the management controller
*/
protected RegistryScenarioResourceProvider(final AmbariManagementController managementController) {
- super(PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
+ super(Resource.Type.RegistryScenario, PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
}
/**
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootClusterSettingsResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootClusterSettingsResourceProvider.java
index 1488672..78c1f9d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootClusterSettingsResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RootClusterSettingsResourceProvider.java
@@ -87,7 +87,7 @@ public class RootClusterSettingsResourceProvider extends ReadOnlyResourceProvide
}
protected RootClusterSettingsResourceProvider(@Assisted AmbariManagementController managementController) {
- super(PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
+ super(Type.RootClusterSetting, PROPERTY_IDS, KEY_PROPERTY_IDS, managementController);
}
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 5f61c7d..c329bb1 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
@@ -228,10 +228,10 @@ public class HostVersionOutOfSyncListener {
for (HostComponentDesiredStateEntity hostComponent : hostComponents) {
// Skip lookup if stack does not contain the component
if (!ami.get().isValidServiceComponent(stackId.getStackName(),
- stackId.getStackVersion(), hostComponent.getServiceName(), hostComponent.getComponentName())) {
+ stackId.getStackVersion(), serviceName, hostComponent.getComponentName())) {
LOG.debug("Component not found is host stack, stack={}, version={}, service={}, component={}",
stackId.getStackName(), stackId.getStackVersion(),
- hostComponent.getServiceName(), hostComponent.getComponentName());
+ serviceName, hostComponent.getComponentName());
continue;
}
ComponentInfo ci = ami.get().getComponent(stackId.getStackName(), stackId.getStackVersion(),
@@ -280,9 +280,9 @@ public class HostVersionOutOfSyncListener {
// Skip lookup if stack does not contain the component
if (!ami.get().isValidServiceComponent(repositoryVersion.getStackName(),
- repositoryVersion.getStackVersion(), serviceName, componentName)) {
+ repositoryVersion.getStackVersion(), event.getServiceName(), componentName)) {
LOG.debug("Component not found is host stack, stack={}, version={}, service={}, component={}",
- repositoryVersion.getStackName(), repositoryVersion.getStackVersion(), serviceName, componentName);
+ repositoryVersion.getStackName(), repositoryVersion.getStackVersion(), event.getServiceName(), componentName);
continue;
}
ComponentInfo component = ami.get().getComponent(repositoryVersion.getStackName(),
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 4ab3a3d..55a7ea6 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
@@ -31,7 +31,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
index 1f869f9..12bcb10 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
@@ -82,8 +82,8 @@ import org.apache.ambari.server.orm.dao.ArtifactDAO;
import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
import org.apache.ambari.server.orm.dao.KerberosKeytabPrincipalDAO;
import org.apache.ambari.server.orm.dao.KerberosPrincipalDAO;
-import org.apache.ambari.server.resources.RootLevelSettingsManagerFactory;
import org.apache.ambari.server.orm.entities.KerberosKeytabPrincipalEntity;
+import org.apache.ambari.server.resources.RootLevelSettingsManagerFactory;
import org.apache.ambari.server.security.SecurityHelper;
import org.apache.ambari.server.security.credential.PrincipalKeyCredential;
import org.apache.ambari.server.security.encryption.CredentialStoreService;
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java
index a34bf23..c73d056 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.controller.internal;
-import org.apache.ambari.server.security.authorization.Users;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.capture;
import static org.easymock.EasyMock.expect;
@@ -70,9 +69,6 @@ import org.apache.ambari.server.mpack.MpackManagerFactory;
import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.orm.dao.GroupDAO;
import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
-import org.apache.ambari.server.registry.RegistryFactory;
-import org.apache.ambari.server.registry.RegistryManager;
-import org.apache.ambari.server.resources.RootLevelSettingsManagerFactory;
import org.apache.ambari.server.orm.dao.MemberDAO;
import org.apache.ambari.server.orm.dao.PermissionDAO;
import org.apache.ambari.server.orm.dao.PrincipalDAO;
@@ -89,10 +85,14 @@ import org.apache.ambari.server.orm.entities.PrivilegeEntity;
import org.apache.ambari.server.orm.entities.ResourceEntity;
import org.apache.ambari.server.orm.entities.UserAuthenticationEntity;
import org.apache.ambari.server.orm.entities.UserEntity;
+import org.apache.ambari.server.registry.RegistryFactory;
+import org.apache.ambari.server.registry.RegistryManager;
+import org.apache.ambari.server.resources.RootLevelSettingsManagerFactory;
import org.apache.ambari.server.scheduler.ExecutionScheduler;
import org.apache.ambari.server.security.TestAuthenticationFactory;
import org.apache.ambari.server.security.authorization.AuthorizationException;
import org.apache.ambari.server.security.authorization.UserAuthenticationType;
+import org.apache.ambari.server.security.authorization.Users;
import org.apache.ambari.server.security.encryption.CredentialStoreService;
import org.apache.ambari.server.security.encryption.CredentialStoreServiceImpl;
import org.apache.ambari.server.stack.StackManagerFactory;
@@ -436,6 +436,8 @@ public class UserResourceProviderTest extends EasyMockSupport {
bind(GroupDAO.class).toInstance(createMock(GroupDAO.class));
bind(MemberDAO.class).toInstance(createMock(MemberDAO.class));
bind(PrincipalDAO.class).toInstance(createMock(PrincipalDAO.class));
+ bind(PrincipalDAO.class).toInstance(createMock(PrincipalDAO.class));
+ bind(PrincipalDAO.class).toInstance(createMock(PrincipalDAO.class));
bind(PermissionDAO.class).toInstance(createMock(PermissionDAO.class));
bind(PrivilegeDAO.class).toInstance(createMock(PrivilegeDAO.class));
bind(ResourceDAO.class).toInstance(createMock(ResourceDAO.class));
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
index 5109d8d..670dd65 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/upgrade/UpgradeCatalog300Test.java
@@ -36,7 +36,6 @@ import static org.apache.ambari.server.upgrade.UpgradeCatalog300.REQUEST_DISPLAY
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.REQUEST_TABLE;
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.SECURITY_STATE_COLUMN;
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.SERVICE_DESIRED_STATE_TABLE;
-import static org.easymock.EasyMock.anyLong;
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.STAGE_DISPLAY_STATUS_COLUMN;
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.STAGE_STATUS_COLUMN;
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.STAGE_TABLE;
@@ -60,6 +59,7 @@ import static org.apache.ambari.server.upgrade.UpgradeCatalog300.USER_AUTHENTICA
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.USER_AUTHENTICATION_USER_AUTHENTICATION_ID_COLUMN;
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.USER_AUTHENTICATION_USER_AUTHENTICATION_USERS_FOREIGN_KEY;
import static org.apache.ambari.server.upgrade.UpgradeCatalog300.USER_AUTHENTICATION_USER_ID_COLUMN;
+import static org.easymock.EasyMock.anyLong;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.anyString;
import static org.easymock.EasyMock.capture;
--
To stop receiving notification emails like this one, please contact
mradhakrishnan@apache.org.