You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by aj...@apache.org on 2016/04/20 00:39:50 UTC
[2/2] ambari git commit: AMBARI-15888. Pass request object to delete
API in resource providers (ajit)
AMBARI-15888. Pass request object to delete API in resource providers (ajit)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36d2b0c9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36d2b0c9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36d2b0c9
Branch: refs/heads/trunk
Commit: 36d2b0c91fb365448ba140015f48616ff9c4426f
Parents: 6eb521d
Author: Ajit Kumar <aj...@apache.org>
Authored: Tue Apr 19 15:38:24 2016 -0700
Committer: Ajit Kumar <aj...@apache.org>
Committed: Tue Apr 19 15:38:53 2016 -0700
----------------------------------------------------------------------
.../persistence/PersistenceManagerImpl.java | 2 +-
.../GSInstallerResourceProvider.java | 2 +-
.../AbstractAuthorizedResourceProvider.java | 15 ++++++---
.../internal/ActionResourceProvider.java | 2 +-
.../ActiveWidgetLayoutResourceProvider.java | 2 +-
.../AlertDefinitionResourceProvider.java | 2 +-
.../internal/AlertGroupResourceProvider.java | 2 +-
.../internal/AlertHistoryResourceProvider.java | 7 +----
.../internal/AlertNoticeResourceProvider.java | 6 +---
.../internal/AlertTargetResourceProvider.java | 2 +-
.../internal/ArtifactResourceProvider.java | 2 +-
.../internal/BlueprintResourceProvider.java | 2 +-
.../internal/ClientConfigResourceProvider.java | 4 +--
.../internal/ClusterControllerImpl.java | 8 ++---
.../internal/ClusterResourceProvider.java | 2 +-
.../ClusterStackVersionResourceProvider.java | 2 +-
.../internal/ComponentResourceProvider.java | 2 +-
.../internal/ConfigGroupResourceProvider.java | 2 +-
.../internal/ConfigurationResourceProvider.java | 2 +-
.../internal/CredentialResourceProvider.java | 2 +-
.../internal/FeedResourceProvider.java | 2 +-
.../internal/GroupResourceProvider.java | 2 +-
.../internal/HostComponentResourceProvider.java | 4 +--
.../internal/HostResourceProvider.java | 2 +-
.../HostStackVersionResourceProvider.java | 2 +-
.../internal/InstanceResourceProvider.java | 2 +-
.../internal/JobResourceProvider.java | 2 +-
.../KerberosDescriptorResourceProvider.java | 2 +-
.../internal/LdapSyncEventResourceProvider.java | 2 +-
.../internal/MemberResourceProvider.java | 2 +-
.../internal/PermissionResourceProvider.java | 2 +-
.../internal/PrivilegeResourceProvider.java | 2 +-
.../QuickLinkArtifactResourceProvider.java | 2 +-
.../internal/ReadOnlyResourceProvider.java | 2 +-
.../internal/RepositoryResourceProvider.java | 2 +-
.../RepositoryVersionResourceProvider.java | 2 +-
.../internal/RequestResourceProvider.java | 2 +-
.../RequestScheduleResourceProvider.java | 2 +-
.../ServiceConfigVersionResourceProvider.java | 2 +-
.../internal/ServiceResourceProvider.java | 2 +-
.../internal/SettingResourceProvider.java | 2 +-
.../internal/StackArtifactResourceProvider.java | 3 +-
.../StackDependencyResourceProvider.java | 2 +-
.../internal/StageResourceProvider.java | 2 +-
.../internal/TargetClusterResourceProvider.java | 2 +-
.../internal/TaskAttemptResourceProvider.java | 2 +-
.../internal/TaskResourceProvider.java | 2 +-
.../internal/ThemeArtifactResourceProvider.java | 2 +-
.../internal/UpgradeGroupResourceProvider.java | 2 +-
.../internal/UpgradeResourceProvider.java | 2 +-
.../UpgradeSummaryResourceProvider.java | 2 +-
.../internal/UserResourceProvider.java | 2 +-
.../VersionDefinitionResourceProvider.java | 2 +-
.../internal/ViewInstanceResourceProvider.java | 2 +-
.../ViewPermissionResourceProvider.java | 2 +-
.../internal/ViewResourceProvider.java | 2 +-
.../internal/ViewVersionResourceProvider.java | 2 +-
.../internal/WidgetLayoutResourceProvider.java | 2 +-
.../internal/WidgetResourceProvider.java | 2 +-
.../internal/WorkflowResourceProvider.java | 2 +-
.../controller/jdbc/JDBCResourceProvider.java | 3 +-
.../controller/spi/ClusterController.java | 29 ++++++++++--------
.../server/controller/spi/ResourceProvider.java | 16 +++++-----
.../kerberos/CleanupServerAction.java | 3 +-
.../view/ViewExternalSubResourceProvider.java | 2 +-
.../server/view/ViewSubResourceProvider.java | 2 +-
.../services/PersistenceManagerImplTest.java | 7 +++--
.../GSInstallerClusterProviderTest.java | 3 +-
.../GSInstallerComponentProviderTest.java | 3 +-
.../GSInstallerHostComponentProviderTest.java | 3 +-
.../GSInstallerHostProviderTest.java | 3 +-
.../GSInstallerServiceProviderTest.java | 4 ++-
.../AbstractJDBCResourceProviderTest.java | 2 +-
.../internal/AbstractResourceProviderTest.java | 2 +-
.../ActiveWidgetLayoutResourceProviderTest.java | 2 +-
.../AlertDefinitionResourceProviderTest.java | 2 +-
.../AlertGroupResourceProviderTest.java | 4 +--
.../AlertTargetResourceProviderTest.java | 2 +-
.../AmbariPrivilegeResourceProviderTest.java | 2 +-
.../internal/ArtifactResourceProviderTest.java | 2 +-
.../internal/BlueprintResourceProviderTest.java | 2 +-
.../ClientConfigResourceProviderTest.java | 2 +-
.../internal/ClusterControllerImplTest.java | 10 +++---
...rKerberosDescriptorResourceProviderTest.java | 2 +-
.../ClusterPrivilegeResourceProviderTest.java | 2 +-
.../internal/ClusterResourceProviderTest.java | 4 +--
.../internal/ComponentResourceProviderTest.java | 6 ++--
.../ConfigGroupResourceProviderTest.java | 2 +-
.../ConfigurationResourceProviderTest.java | 2 +-
.../CredentialResourceProviderTest.java | 2 +-
.../internal/FeedResourceProviderTest.java | 2 +-
.../GroupPrivilegeResourceProviderTest.java | 2 +-
.../internal/GroupResourceProviderTest.java | 2 +-
.../HostComponentResourceProviderTest.java | 2 +-
...ostKerberosIdentityResourceProviderTest.java | 2 +-
.../internal/HostResourceProviderTest.java | 2 +-
.../internal/InstanceResourceProviderTest.java | 2 +-
.../LdapSyncEventResourceProviderTest.java | 2 +-
.../internal/MemberResourceProviderTest.java | 2 +-
.../PermissionResourceProviderTest.java | 32 ++++----------------
.../RepositoryVersionResourceProviderTest.java | 2 +-
.../internal/RequestResourceProviderTest.java | 2 +-
.../RequestScheduleResourceProviderTest.java | 2 +-
.../RoleAuthorizationResourceProviderTest.java | 3 +-
.../controller/internal/SchemaImplTest.java | 2 +-
.../internal/ServiceResourceProviderTest.java | 9 +++---
.../internal/SettingResourceProviderTest.java | 6 ++--
.../internal/StageResourceProviderTest.java | 10 ++----
.../TargetClusterResourceProviderTest.java | 2 +-
.../internal/TaskResourceProviderTest.java | 15 +++------
.../UserAuthorizationResourceProviderTest.java | 2 +-
.../UserPrivilegeResourceProviderTest.java | 2 +-
.../internal/UserResourceProviderTest.java | 2 +-
.../ViewInstanceResourceProviderTest.java | 2 +-
.../WidgetLayoutResourceProviderTest.java | 2 +-
.../internal/WidgetResourceProviderTest.java | 2 +-
116 files changed, 182 insertions(+), 216 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java
index 3037446..0dd8643 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/persistence/PersistenceManagerImpl.java
@@ -130,7 +130,7 @@ public class PersistenceManagerImpl implements PersistenceManager {
throws UnsupportedPropertyException, SystemException, NoSuchParentResourceException, NoSuchResourceException {
//todo: need to account for multiple resources and user predicate
return m_controller.deleteResources(resource.getResourceDefinition().getType(),
- resource.getQuery().getPredicate());
+ createControllerRequest(requestBody), resource.getQuery().getPredicate());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java
index d403114..66cdff1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerResourceProvider.java
@@ -99,7 +99,7 @@ public abstract class GSInstallerResourceProvider implements ResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Management operations are not supported");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractAuthorizedResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractAuthorizedResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractAuthorizedResourceProvider.java
index 0837a5d..253d23c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractAuthorizedResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AbstractAuthorizedResourceProvider.java
@@ -26,6 +26,7 @@ import org.apache.ambari.server.controller.spi.Request;
import org.apache.ambari.server.controller.spi.RequestStatus;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
+import org.apache.ambari.server.controller.spi.ResourceProvider;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.security.authorization.AuthorizationException;
@@ -309,6 +310,8 @@ public abstract class AbstractAuthorizedResourceProvider extends AbstractResourc
* This method may be overwritten by implementing classes to avoid performing authorization checks
* to delete resources.
*
+ *
+ * @param request
* @param predicate the predicate object which can be used to filter which
* resources are deleted
* @return the request status
@@ -319,7 +322,7 @@ public abstract class AbstractAuthorizedResourceProvider extends AbstractResourc
* @throws AuthorizationException if the authenticated user is not authorized to perform this operation
*/
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
Authentication authentication = AuthorizationHelper.getAuthentication();
@@ -329,7 +332,7 @@ public abstract class AbstractAuthorizedResourceProvider extends AbstractResourc
throw new AuthorizationException("The authenticated user does not have the appropriate authorizations to delete the requested resource(s)");
}
- return deleteResourcesAuthorized(predicate);
+ return deleteResourcesAuthorized(request, predicate);
}
// ----- ResourceProvider (end) --------------------------------------------
@@ -450,8 +453,10 @@ public abstract class AbstractAuthorizedResourceProvider extends AbstractResourc
* Delete the resources selected by the given predicate if the authenticated user is authorized
* to do so.
* <p/>
- * This method must be overwritten if {@link #deleteResources(Predicate)} is not overwritten.
+ * This method must be overwritten if {@link ResourceProvider#deleteResources(Request, Predicate)} is not overwritten.
+ *
*
+ * @param request
* @param predicate the predicate object which can be used to filter which resources are deleted
* @return the request status
* @throws SystemException an internal system exception occurred
@@ -459,9 +464,9 @@ public abstract class AbstractAuthorizedResourceProvider extends AbstractResourc
* @throws NoSuchResourceException the resource instance to be deleted doesn't exist
* @throws NoSuchParentResourceException a parent resource of the resource doesn't exist
* @throws AuthorizationException if the authenticated user is not authorized to perform this operation
- * @see #deleteResources(Predicate)
+ * @see ResourceProvider#deleteResources(Request, Predicate)
*/
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("If deleteResources is not overwritten, then deleteResourcesAuthorized must be overwritten");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
index faef86c..54fa54c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActionResourceProvider.java
@@ -143,7 +143,7 @@ public class ActionResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Not currently supported.");
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
index 10eecac..d149a70 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProvider.java
@@ -241,7 +241,7 @@ public class ActiveWidgetLayoutResourceProvider extends AbstractControllerResour
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("The request is not supported");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
index bcf0205..9c91c14 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProvider.java
@@ -347,7 +347,7 @@ public class AlertDefinitionResourceProvider extends AbstractControllerResourceP
* {@inheritDoc}
*/
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
index dafd194..f5a5d7e 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProvider.java
@@ -206,7 +206,7 @@ public class AlertGroupResourceProvider extends
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java
index f52ee62..d4fe94a 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertHistoryResourceProvider.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.controller.internal;
import java.util.Arrays;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -48,11 +47,7 @@ import org.apache.ambari.server.orm.entities.AlertHistoryEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import com.google.inject.Inject;
-import org.apache.ambari.server.security.authorization.AuthorizationHelper;
-import org.apache.ambari.server.security.authorization.ResourceType;
-import org.apache.ambari.server.security.authorization.RoleAuthorization;
import org.apache.commons.lang.StringUtils;
-import sun.net.www.protocol.http.AuthenticationHeader;
/**
* ResourceProvider for Alert History
@@ -158,7 +153,7 @@ public class AlertHistoryResourceProvider extends ReadOnlyResourceProvider imple
* {@inheritDoc}
*/
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
index f19bea9..ca8c108 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertNoticeResourceProvider.java
@@ -18,7 +18,6 @@
package org.apache.ambari.server.controller.internal;
import java.util.Arrays;
-import java.util.EnumSet;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashSet;
@@ -49,9 +48,6 @@ import org.apache.ambari.server.orm.entities.AlertTargetEntity;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import com.google.inject.Inject;
-import org.apache.ambari.server.security.authorization.AuthorizationHelper;
-import org.apache.ambari.server.security.authorization.ResourceType;
-import org.apache.ambari.server.security.authorization.RoleAuthorization;
import org.apache.commons.lang.StringUtils;
/**
@@ -144,7 +140,7 @@ public class AlertNoticeResourceProvider extends AbstractControllerResourceProvi
* {@inheritDoc}
*/
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
index 3b749d9..4acbdc5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProvider.java
@@ -212,7 +212,7 @@ public class AlertTargetResourceProvider extends
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
index 34952f2..7a9214f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ArtifactResourceProvider.java
@@ -231,7 +231,7 @@ public class ArtifactResourceProvider extends AbstractResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException,
UnsupportedPropertyException,
NoSuchResourceException,
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
index a4b2aaa..de998ce 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/BlueprintResourceProvider.java
@@ -244,7 +244,7 @@ public class BlueprintResourceProvider extends AbstractControllerResourceProvide
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index 3e4d7fd..9a86827 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -38,7 +38,6 @@ import org.apache.ambari.server.controller.spi.ResourceAlreadyExistsException;
import org.apache.ambari.server.controller.spi.SystemException;
import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
-import org.apache.ambari.server.stack.StackManager;
import org.apache.ambari.server.state.ClientConfigFileDefinition;
import org.apache.ambari.server.state.Cluster;
import org.apache.ambari.server.state.Clusters;
@@ -46,7 +45,6 @@ import org.apache.ambari.server.state.ComponentInfo;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.ConfigHelper;
import org.apache.ambari.server.state.DesiredConfig;
-import org.apache.ambari.server.state.PropertyInfo;
import org.apache.ambari.server.state.PropertyInfo.PropertyType;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.ServiceOsSpecific;
@@ -434,7 +432,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("The request is not supported");
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
index e776b5a..32bed7b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterControllerImpl.java
@@ -322,7 +322,7 @@ public class ClusterControllerImpl implements ClusterController {
}
@Override
- public RequestStatus deleteResources(Type type, Predicate predicate)
+ public RequestStatus deleteResources(Type type, Request request, Predicate predicate)
throws UnsupportedPropertyException,
SystemException,
NoSuchResourceException,
@@ -336,7 +336,7 @@ public class ClusterControllerImpl implements ClusterController {
return null;
}
}
- return provider.deleteResources(predicate);
+ return provider.deleteResources(request, predicate);
}
return null;
}
@@ -991,9 +991,9 @@ public class ClusterControllerImpl implements ClusterController {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
- return resourceProvider.deleteResources(predicate);
+ return resourceProvider.deleteResources(request, predicate);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
index 51c0db9..cc36f75 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterResourceProvider.java
@@ -351,7 +351,7 @@ public class ClusterResourceProvider extends AbstractControllerResourceProvider
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
index 01333d5..9dc5c4d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClusterStackVersionResourceProvider.java
@@ -780,7 +780,7 @@ public class ClusterStackVersionResourceProvider extends AbstractControllerResou
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("Method not supported");
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
index 6236ac2..dd2b31b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ComponentResourceProvider.java
@@ -213,7 +213,7 @@ public class ComponentResourceProvider extends AbstractControllerResourceProvide
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<ServiceComponentRequest> requests = new HashSet<>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index 2677ec7..9402c95 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
@@ -215,7 +215,7 @@ public class ConfigGroupResourceProvider extends
}
@Override
- public RequestStatus deleteResourcesAuthorized(Predicate predicate) throws
+ public RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate) throws
SystemException, UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java
index f9d12b5..6e9765c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProvider.java
@@ -229,7 +229,7 @@ public class ConfigurationResourceProvider extends
* Throws an exception, as Configurations cannot be deleted.
*/
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException,
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException,
UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Cannot delete a Configuration resource.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
index 8a3937a..bbd5051 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/CredentialResourceProvider.java
@@ -194,7 +194,7 @@ public class CredentialResourceProvider extends AbstractControllerResourceProvid
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java
index 5087049..cc35a8c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/FeedResourceProvider.java
@@ -184,7 +184,7 @@ public class FeedResourceProvider extends AbstractDRResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
IvoryService service = getService();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
index 0d215ae..e1aa5ac 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/GroupResourceProvider.java
@@ -160,7 +160,7 @@ public class GroupResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<GroupRequest> requests = new HashSet<GroupRequest>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
index 39a09a6..83bfeaa 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostComponentResourceProvider.java
@@ -30,7 +30,6 @@ import java.util.Map;
import java.util.Set;
import org.apache.ambari.server.AmbariException;
-import org.apache.ambari.server.configuration.ComponentSSLConfiguration;
import org.apache.ambari.server.controller.AmbariManagementController;
import org.apache.ambari.server.controller.MaintenanceStateHelper;
import org.apache.ambari.server.controller.RequestStatusResponse;
@@ -42,7 +41,6 @@ import org.apache.ambari.server.controller.predicate.NotPredicate;
import org.apache.ambari.server.controller.spi.NoSuchParentResourceException;
import org.apache.ambari.server.controller.spi.NoSuchResourceException;
import org.apache.ambari.server.controller.spi.Predicate;
-import org.apache.ambari.server.controller.spi.PropertyProvider;
import org.apache.ambari.server.controller.spi.Request;
import org.apache.ambari.server.controller.spi.RequestStatus;
import org.apache.ambari.server.controller.spi.Resource;
@@ -293,7 +291,7 @@ public class HostComponentResourceProvider extends AbstractControllerResourcePro
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<ServiceComponentHostRequest> requests = new HashSet<ServiceComponentHostRequest>();
for (Map<String, Object> propertyMap : getPropertyMaps(predicate)) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
index 322eab8..2bd1664 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostResourceProvider.java
@@ -330,7 +330,7 @@ public class HostResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<HostRequest> requests = new HashSet<HostRequest>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
index b3f353c..4ee6670 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/HostStackVersionResourceProvider.java
@@ -488,7 +488,7 @@ public class HostStackVersionResourceProvider extends AbstractControllerResource
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("Method not supported");
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java
index 49f968f..e06ea91 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/InstanceResourceProvider.java
@@ -163,7 +163,7 @@ public class InstanceResourceProvider extends AbstractDRResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException,
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException,
UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
IvoryService service = getService();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
index c732842..6235651 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/JobResourceProvider.java
@@ -154,7 +154,7 @@ public class JobResourceProvider extends
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java
index 3cece5d..f248316 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/KerberosDescriptorResourceProvider.java
@@ -146,7 +146,7 @@ public class KerberosDescriptorResourceProvider extends AbstractControllerResour
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException,
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException,
UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
Set<Resource> setResources = getResources(new RequestImpl(null, null, null, null), predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
index 3d18a27..9939e08 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProvider.java
@@ -219,7 +219,7 @@ public class LdapSyncEventResourceProvider extends AbstractControllerResourcePro
}
@Override
- public RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ public RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
modifyResources(getDeleteCommand(predicate));
notifyDelete(Resource.Type.ViewInstance, predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
index 307ed3f..b3470d1 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MemberResourceProvider.java
@@ -168,7 +168,7 @@ public class MemberResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<MemberRequest> requests = new HashSet<MemberRequest>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
index 86f8321..74de336 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PermissionResourceProvider.java
@@ -129,7 +129,7 @@ public class PermissionResourceProvider extends AbstractResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Not supported.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
index 4a44375..c825dc9 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/PrivilegeResourceProvider.java
@@ -241,7 +241,7 @@ public abstract class PrivilegeResourceProvider<T> extends AbstractAuthorizedRes
}
@Override
- public RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ public RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
modifyResources(getDeleteCommand(predicate));
notifyDelete(resourceType, predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
index ed64342..034aeb7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/QuickLinkArtifactResourceProvider.java
@@ -123,7 +123,7 @@ public class QuickLinkArtifactResourceProvider extends AbstractControllerResourc
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Deleting of quick links is not supported");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ReadOnlyResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ReadOnlyResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ReadOnlyResourceProvider.java
index 562aa34..342983f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ReadOnlyResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ReadOnlyResourceProvider.java
@@ -65,7 +65,7 @@ public abstract class ReadOnlyResourceProvider extends AbstractControllerResourc
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException(READ_ONLY_MSG, null);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
index 18d597e..3b5b0a7 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryResourceProvider.java
@@ -214,7 +214,7 @@ public class RepositoryResourceProvider extends AbstractControllerResourceProvid
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("Cannot delete repositories.", null);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
index 4bb0e3b..0370384 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
@@ -391,7 +391,7 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
index be13ec0..5b318af 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestResourceProvider.java
@@ -336,7 +336,7 @@ public class RequestResourceProvider extends AbstractControllerResourceProvider
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Not currently supported.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java
index 6a80335..e21193d 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProvider.java
@@ -263,7 +263,7 @@ public class RequestScheduleResourceProvider extends AbstractControllerResourceP
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws
SystemException, UnsupportedPropertyException, NoSuchResourceException,
NoSuchParentResourceException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
index beafb1f..d7287e5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceConfigVersionResourceProvider.java
@@ -178,7 +178,7 @@ public class ServiceConfigVersionResourceProvider extends
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Cannot delete service config version");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
index adfac0c..47342f3 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceResourceProvider.java
@@ -231,7 +231,7 @@ public class ServiceResourceProvider extends AbstractControllerResourceProvider
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<ServiceRequest> requests = new HashSet<ServiceRequest>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java
index e1f9015..8391961 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/SettingResourceProvider.java
@@ -157,7 +157,7 @@ public class SettingResourceProvider extends AbstractAuthorizedResourceProvider
}
@Override
- public RequestStatus deleteResourcesAuthorized(Predicate predicate) {
+ public RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate) {
final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate);
for (Map<String, Object> propertyMap : propertyMaps) {
if (propertyMap.containsKey(SETTING_NAME_PROPERTY_ID)) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
index 4d047d5..123b3c8 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackArtifactResourceProvider.java
@@ -38,7 +38,6 @@ import org.apache.ambari.server.controller.spi.UnsupportedPropertyException;
import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.state.ServiceInfo;
import org.apache.ambari.server.state.StackInfo;
-import org.apache.ambari.server.state.ThemeInfo;
import org.apache.ambari.server.state.kerberos.KerberosDescriptor;
import org.apache.ambari.server.state.kerberos.KerberosDescriptorFactory;
import org.apache.ambari.server.state.kerberos.KerberosServiceDescriptor;
@@ -232,7 +231,7 @@ public class StackArtifactResourceProvider extends AbstractControllerResourcePro
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException,
UnsupportedPropertyException,
NoSuchResourceException,
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java
index 02fc8f5..fcbd654 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StackDependencyResourceProvider.java
@@ -152,7 +152,7 @@ public class StackDependencyResourceProvider extends AbstractResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
index a563420..d3cb96c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/StageResourceProvider.java
@@ -191,7 +191,7 @@ public class StageResourceProvider extends AbstractControllerResourceProvider im
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java
index 7fe2b39..a4d7722 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProvider.java
@@ -135,7 +135,7 @@ public class TargetClusterResourceProvider extends AbstractDRResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException, UnsupportedPropertyException,
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
IvoryService service = getService();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
index 6f8b2cf..146be90 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskAttemptResourceProvider.java
@@ -158,7 +158,7 @@ public class TaskAttemptResourceProvider extends
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
index cb8a343..a33f9df 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/TaskResourceProvider.java
@@ -268,7 +268,7 @@ public class TaskResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Not currently supported.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
index 4b5c95d..dafed42 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ThemeArtifactResourceProvider.java
@@ -123,7 +123,7 @@ public class ThemeArtifactResourceProvider extends AbstractControllerResourcePro
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Deleting of themes is not supported");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
index e7ca9aa..9b8b018 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeGroupResourceProvider.java
@@ -165,7 +165,7 @@ public class UpgradeGroupResourceProvider extends AbstractControllerResourceProv
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("Upgrade groups cannot be removed");
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/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 4cd0419..b069862 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
@@ -515,7 +515,7 @@ public class UpgradeResourceProvider extends AbstractControllerResourceProvider
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException,
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException,
UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("Cannot delete Upgrades");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProvider.java
index cf4b08f..4bd6859 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UpgradeSummaryResourceProvider.java
@@ -190,7 +190,7 @@ public class UpgradeSummaryResourceProvider extends AbstractControllerResourcePr
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException,
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException,
UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Resource only supports GET operation.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
index 099cfd4..0324d38 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/UserResourceProvider.java
@@ -167,7 +167,7 @@ public class UserResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- public RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ public RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<UserRequest> requests = new HashSet<UserRequest>();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/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 e26adde..a78af6e 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
@@ -341,7 +341,7 @@ public class VersionDefinitionResourceProvider extends AbstractAuthorizedResourc
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new SystemException("Cannot delete Version Definitions");
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java
index abdda7f..6523962 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProvider.java
@@ -201,7 +201,7 @@ public class ViewInstanceResourceProvider extends AbstractAuthorizedResourceProv
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
modifyResources(getDeleteCommand(predicate));
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java
index 979e214..4f0a6f0 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewPermissionResourceProvider.java
@@ -153,7 +153,7 @@ public class ViewPermissionResourceProvider extends AbstractResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Not supported.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java
index ee01927..189daef 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewResourceProvider.java
@@ -130,7 +130,7 @@ public class ViewResourceProvider extends AbstractAuthorizedResourceProvider {
}
@Override
- protected RequestStatus deleteResourcesAuthorized(Predicate predicate)
+ protected RequestStatus deleteResourcesAuthorized(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Not yet supported.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
index 570766d..1bf750b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ViewVersionResourceProvider.java
@@ -165,7 +165,7 @@ public class ViewVersionResourceProvider extends AbstractResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException("Not supported.");
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
index 67ccafd..771c7ae 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProvider.java
@@ -333,7 +333,7 @@ public class WidgetLayoutResourceProvider extends AbstractControllerResourceProv
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
index e6953a9..70cfb05 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WidgetResourceProvider.java
@@ -333,7 +333,7 @@ public class WidgetResourceProvider extends AbstractControllerResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
final Set<Map<String, Object>> propertyMaps = getPropertyMaps(predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
index a925f26..35adbcb 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/WorkflowResourceProvider.java
@@ -151,7 +151,7 @@ public class WorkflowResourceProvider extends
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
index e969505..1dc1715 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/jdbc/JDBCResourceProvider.java
@@ -40,7 +40,6 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Set;
-import java.util.logging.Level;
/**
* Generic JDBC based resource provider.
@@ -235,7 +234,7 @@ public class JDBCResourceProvider extends BaseProvider implements ResourceProvid
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
Connection connection = null;
try {