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:49 UTC
[1/2] ambari git commit: AMBARI-15888. Pass request object to delete
API in resource providers (ajit)
Repository: ambari
Updated Branches:
refs/heads/trunk 6eb521d96 -> 36d2b0c91
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
index ec7425e..1d7dbcc 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ClusterController.java
@@ -67,10 +67,10 @@ public interface ClusterController extends SchemaFactory {
*
* @throws SystemException if unable to populate the resources
*/
- public Set<Resource> populateResources(Resource.Type type,
- Set<Resource> resources,
- Request request,
- Predicate predicate) throws SystemException;
+ Set<Resource> populateResources(Resource.Type type,
+ Set<Resource> resources,
+ Request request,
+ Predicate predicate) throws SystemException;
/**
* Get an iterable set of resources from the given set of resources filtered by the
@@ -135,7 +135,7 @@ public interface ClusterController extends SchemaFactory {
* @return the schema object for the given resource
*/
@Override
- public Schema getSchema(Resource.Type type);
+ Schema getSchema(Resource.Type type);
/**
* Get the resource provider for the given type, creating it if required.
@@ -144,7 +144,7 @@ public interface ClusterController extends SchemaFactory {
*
* @return the resource provider
*/
- public ResourceProvider ensureResourceProvider(Resource.Type type);
+ ResourceProvider ensureResourceProvider(Resource.Type type);
// ----- Management -------------------------------------------------------
@@ -161,7 +161,7 @@ public interface ClusterController extends SchemaFactory {
* @throws ResourceAlreadyExistsException attempted to create a resource that already exists
* @throws NoSuchParentResourceException a specified parent resource doesn't exist
*/
- public RequestStatus createResources(Resource.Type type, Request request)
+ RequestStatus createResources(Resource.Type type, Request request)
throws UnsupportedPropertyException,
SystemException,
ResourceAlreadyExistsException,
@@ -184,9 +184,9 @@ public interface ClusterController extends SchemaFactory {
* @throws NoSuchResourceException no matching resource(s) found
* @throws NoSuchParentResourceException a specified parent resource doesn't exist
*/
- public RequestStatus updateResources(Resource.Type type,
- Request request,
- Predicate predicate)
+ RequestStatus updateResources(Resource.Type type,
+ Request request,
+ Predicate predicate)
throws UnsupportedPropertyException,
SystemException,
NoSuchResourceException,
@@ -196,16 +196,19 @@ public interface ClusterController extends SchemaFactory {
* Delete the resources selected by the given predicate.
*
* @param type the type of the resources
+ * @param request the request object which defines the set of properties
+ * for the resources to be deleted
* @param predicate the predicate object which can be used to filter which
* resources are deleted
- *
- * @throws UnsupportedPropertyException thrown if the predicate contains
+ * @throws UnsupportedPropertyException thrown if the predicate contains
* unsupported property ids
* @throws SystemException an internal exception occurred
* @throws NoSuchResourceException no matching resource(s) found
* @throws NoSuchParentResourceException a specified parent resource doesn't exist
*/
- public RequestStatus deleteResources(Resource.Type type, Predicate predicate)
+ RequestStatus deleteResources(Resource.Type type,
+ Request request,
+ Predicate predicate)
throws UnsupportedPropertyException,
SystemException,
NoSuchResourceException,
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java
index de1c9dd..56d9748 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/spi/ResourceProvider.java
@@ -44,7 +44,7 @@ public interface ResourceProvider {
* @throws ResourceAlreadyExistsException attempted to create a resource which already exists
* @throws NoSuchParentResourceException a parent resource of the resource to create doesn't exist
*/
- public RequestStatus createResources(Request request)
+ RequestStatus createResources(Request request)
throws SystemException,
UnsupportedPropertyException,
ResourceAlreadyExistsException,
@@ -77,7 +77,7 @@ public interface ResourceProvider {
* @throws NoSuchResourceException the requested resource instance doesn't exist
* @throws NoSuchParentResourceException a parent resource of the requested resource doesn't exist
*/
- public Set<Resource> getResources(Request request, Predicate predicate)
+ Set<Resource> getResources(Request request, Predicate predicate)
throws SystemException,
UnsupportedPropertyException,
NoSuchResourceException,
@@ -101,7 +101,7 @@ public interface ResourceProvider {
* @throws NoSuchResourceException the resource instance to be updated doesn't exist
* @throws NoSuchParentResourceException a parent resource of the resource doesn't exist
*/
- public RequestStatus updateResources(Request request, Predicate predicate)
+ RequestStatus updateResources(Request request, Predicate predicate)
throws SystemException,
UnsupportedPropertyException,
NoSuchResourceException,
@@ -110,8 +110,8 @@ public interface ResourceProvider {
/**
* Delete the resources selected by the given predicate.
*
- *
- *
+ * @param request the request object which defines the set of properties
+ * for the resources to be updated
* @param predicate the predicate object which can be used to filter which
* resources are deleted
*
@@ -122,7 +122,7 @@ public interface ResourceProvider {
* @throws NoSuchResourceException the resource instance to be deleted doesn't exist
* @throws NoSuchParentResourceException a parent resource of the resource doesn't exist
*/
- public RequestStatus deleteResources(Predicate predicate)
+ RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException,
UnsupportedPropertyException,
NoSuchResourceException,
@@ -139,7 +139,7 @@ public interface ResourceProvider {
*
* @return a map of key property ids
*/
- public Map<Resource.Type, String> getKeyPropertyIds();
+ Map<Resource.Type, String> getKeyPropertyIds();
/**
* Check whether the set of given property ids is supported by this resource
@@ -149,5 +149,5 @@ public interface ResourceProvider {
* supported by this resource provider. An empty return set indicates
* that all of the given property ids are supported.
*/
- public Set<String> checkPropertyIds(Set<String> propertyIds);
+ Set<String> checkPropertyIds(Set<String> propertyIds);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
index b6c2f12..4532d7f 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/serveraction/kerberos/CleanupServerAction.java
@@ -21,6 +21,7 @@ import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.actionmanager.HostRoleStatus;
import org.apache.ambari.server.agent.CommandReport;
import org.apache.ambari.server.controller.internal.ArtifactResourceProvider;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.spi.*;
import org.apache.ambari.server.controller.utilities.ClusterControllerHelper;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
@@ -101,7 +102,7 @@ public class CleanupServerAction extends KerberosServerAction {
clusterController.ensureResourceProvider(Resource.Type.Artifact);
try {
- artifactProvider.deleteResources(predicate);
+ artifactProvider.deleteResources(new RequestImpl(null, null, null, null), predicate);
LOG.info("Kerberos descriptor removed successfully.");
actionLog.writeStdOut("Kerberos descriptor removed successfully.");
} catch (NoSuchResourceException e) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java
index f669e49..7aad0b6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewExternalSubResourceProvider.java
@@ -145,7 +145,7 @@ public class ViewExternalSubResourceProvider 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/view/ViewSubResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
index 8e1ccbc..c498652 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/view/ViewSubResourceProvider.java
@@ -212,7 +212,7 @@ public class ViewSubResourceProvider extends AbstractResourceProvider {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
Set<Resource> resources = getResources(PropertyHelper.getReadRequest(), predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
index 243e06a..951c1db 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PersistenceManagerImplTest.java
@@ -23,6 +23,7 @@ import org.apache.ambari.server.api.query.Query;
import org.apache.ambari.server.api.resources.ResourceDefinition;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.persistence.PersistenceManagerImpl;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.internal.RequestStatusImpl;
import org.apache.ambari.server.controller.spi.ClusterController;
import org.apache.ambari.server.controller.spi.Predicate;
@@ -307,11 +308,11 @@ public class PersistenceManagerImplTest {
expect(resource.getQuery()).andReturn(query).anyTimes();
expect(query.getPredicate()).andReturn(predicate).anyTimes();
- expect(controller.deleteResources(Resource.Type.Component, predicate)).andReturn(new RequestStatusImpl(null));
+ expect(controller.deleteResources(Resource.Type.Component, new RequestImpl(null, null, null, null), predicate)).andReturn(new RequestStatusImpl(null));
replay(resource, resourceDefinition, controller, query, predicate);
- new TestPersistenceManager(controller, null, null).delete(resource, body);
+ new PersistenceManagerImpl(controller).delete(resource, body);
verify(resource, resourceDefinition, controller, query, predicate);
}
@@ -337,4 +338,4 @@ public class PersistenceManagerImplTest {
return m_request;
}
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProviderTest.java
index e4a595c..ec462de 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerClusterProviderTest.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.controller.gsinstaller;
import junit.framework.Assert;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
@@ -93,7 +94,7 @@ public class GSInstallerClusterProviderTest {
GSInstallerResourceProvider provider = new GSInstallerClusterProvider(clusterDefinition);
try {
- provider.deleteResources(null);
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
Assert.fail("Expected UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
//expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
index 07ff7fe..fcbf35b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerComponentProviderTest.java
@@ -23,6 +23,7 @@ import java.util.Set;
import junit.framework.Assert;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
@@ -92,7 +93,7 @@ public class GSInstallerComponentProviderTest {
GSInstallerResourceProvider provider = new GSInstallerComponentProvider(clusterDefinition);
try {
- provider.deleteResources(null);
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
Assert.fail("Expected UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
//expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
index c9878f5..21a2d1d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostComponentProviderTest.java
@@ -23,6 +23,7 @@ import java.util.Set;
import junit.framework.Assert;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
@@ -139,7 +140,7 @@ public class GSInstallerHostComponentProviderTest {
GSInstallerResourceProvider provider = new GSInstallerHostComponentProvider(clusterDefinition);
try {
- provider.deleteResources(null);
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
Assert.fail("Expected UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
//expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java
index 32b1250..fa9a274 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerHostProviderTest.java
@@ -19,6 +19,7 @@
package org.apache.ambari.server.controller.gsinstaller;
import junit.framework.Assert;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
@@ -141,7 +142,7 @@ public class GSInstallerHostProviderTest {
GSInstallerResourceProvider provider = new GSInstallerHostProvider(clusterDefinition);
try {
- provider.deleteResources(null);
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
Assert.fail("Expected UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
//expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
index 3fd4bd7..aecf201 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/gsinstaller/GSInstallerServiceProviderTest.java
@@ -23,6 +23,8 @@ import java.util.Set;
import junit.framework.Assert;
+import org.apache.ambari.server.api.services.ResultImpl;
+import org.apache.ambari.server.controller.internal.RequestImpl;
import org.apache.ambari.server.controller.spi.Predicate;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.utilities.PredicateBuilder;
@@ -156,7 +158,7 @@ public class GSInstallerServiceProviderTest {
GSInstallerResourceProvider provider = new GSInstallerServiceProvider(clusterDefinition);
try {
- provider.deleteResources(null);
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
Assert.fail("Expected UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {
//expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
index 0a5cfcc..466b998 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractJDBCResourceProviderTest.java
@@ -121,7 +121,7 @@ public class AbstractJDBCResourceProviderTest {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException,
NoSuchResourceException, NoSuchParentResourceException {
return null;
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
index 1731439..ed16d68 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AbstractResourceProviderTest.java
@@ -887,7 +887,7 @@ public class AbstractResourceProviderTest {
}
@Override
- public RequestStatus deleteResources(Predicate predicate)
+ public RequestStatus deleteResources(Request request, Predicate predicate)
throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
return new RequestStatusImpl(null);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
index e9abfb3..d38108f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ActiveWidgetLayoutResourceProviderTest.java
@@ -316,7 +316,7 @@ public class ActiveWidgetLayoutResourceProviderTest extends EasyMockSupport {
ResourceProvider provider = getResourceProvider(injector, managementController);
- provider.deleteResources(createPredicate(requestedUsername));
+ provider.deleteResources(new RequestImpl(null, null, null, null), createPredicate(requestedUsername));
verifyAll();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
index 79d512a..735e927 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertDefinitionResourceProviderTest.java
@@ -829,7 +829,7 @@ public class AlertDefinitionResourceProviderTest {
expectLastCall();
replay(dao);
- provider.deleteResources(p);
+ provider.deleteResources(new RequestImpl(null, null, null, null), p);
AlertDefinitionEntity entity1 = entityCapture.getValue();
Assert.assertEquals(Long.valueOf(1), entity1.getDefinitionId());
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
index eaf351d..1aeb9f5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertGroupResourceProviderTest.java
@@ -789,7 +789,7 @@ public class AlertGroupResourceProviderTest {
expectLastCall();
replay(m_dao);
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
AlertGroupEntity entity1 = entityCapture.getValue();
assertEquals(ALERT_GROUP_ID, entity1.getGroupId());
@@ -850,7 +850,7 @@ public class AlertGroupResourceProviderTest {
AlertGroupResourceProvider.ALERT_GROUP_ID).equals(
ALERT_GROUP_ID.toString()).toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
verify(m_dao, m_amc);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
index 7277b67..254d72f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AlertTargetResourceProviderTest.java
@@ -819,7 +819,7 @@ public class AlertTargetResourceProviderTest {
expectLastCall();
replay(m_dao);
- provider.deleteResources(p);
+ provider.deleteResources(new RequestImpl(null, null, null, null), p);
AlertTargetEntity entity1 = entityCapture.getValue();
Assert.assertEquals(ALERT_TARGET_ID, entity1.getTargetId());
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
index 98494d8..67a94ea 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/AmbariPrivilegeResourceProviderTest.java
@@ -784,7 +784,7 @@ public class AmbariPrivilegeResourceProviderTest extends EasyMockSupport {
SecurityContextHolder.getContext().setAuthentication(authentication);
ResourceProvider provider = getResourceProvider(injector);
- provider.deleteResources(createPredicate(1L));
+ provider.deleteResources(new RequestImpl(null, null, null, null), createPredicate(1L));
verifyAll();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ArtifactResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ArtifactResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ArtifactResourceProviderTest.java
index 33a228a..7486f40 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ArtifactResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ArtifactResourceProviderTest.java
@@ -450,7 +450,7 @@ public class ArtifactResourceProviderTest {
PredicateBuilder pb = new PredicateBuilder();
Predicate predicate = pb.begin().property("Artifacts/cluster_name").equals("test-cluster").end().toPredicate();
- RequestStatus response = resourceProvider.deleteResources(predicate);
+ RequestStatus response = resourceProvider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ArtifactEntity deleteEntity = deleteEntityCapture.getValue();
ArtifactEntity deleteEntity2 = deleteEntityCapture2.getValue();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
index 30e7c01..2f4f890 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/BlueprintResourceProviderTest.java
@@ -478,7 +478,7 @@ public class BlueprintResourceProviderTest {
AbstractResourceProviderTest.TestObserver observer = new AbstractResourceProviderTest.TestObserver();
provider.addObserver(observer);
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
assertNotNull(lastEvent);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
index e2146d0..9603226 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProviderTest.java
@@ -553,7 +553,7 @@ public class ClientConfigResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(
ClientConfigResourceProvider.COMPONENT_COMPONENT_NAME_PROPERTY_ID).equals("HDFS_CLIENT").toPredicate();
try {
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
Assert.fail("Expected an UnsupportedOperationException");
} catch (SystemException e) {
// expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
index 3f292ca..0bcd067 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterControllerImplTest.java
@@ -767,7 +767,7 @@ public class ClusterControllerImplTest {
Predicate predicate = new PredicateBuilder().property("c1/p2").equals(1).toPredicate();
- controller.deleteResources(Resource.Type.Host, predicate);
+ controller.deleteResources(Resource.Type.Host, new RequestImpl(null, null, null, null), predicate);
Assert.assertEquals(TestHostResourceProvider.Action.Delete, resourceProvider.getLastAction());
Assert.assertNull(resourceProvider.getLastRequest());
@@ -782,7 +782,7 @@ public class ClusterControllerImplTest {
Predicate predicate = new PredicateBuilder().property(UNSUPPORTED_PROPERTY).equals(1).toPredicate();
try {
- controller.deleteResources(Resource.Type.Host, predicate);
+ controller.deleteResources(Resource.Type.Host, new RequestImpl(null, null, null, null), predicate);
Assert.fail("Expected an UnsupportedPropertyException for the unsupported properties.");
} catch (UnsupportedPropertyException e) {
// Expected
@@ -797,7 +797,7 @@ public class ClusterControllerImplTest {
Predicate predicate = new PredicateBuilder().property("c3/p6").equals(1).toPredicate();
- controller.deleteResources(Resource.Type.Host, predicate);
+ controller.deleteResources(Resource.Type.Host, new RequestImpl(null, null, null, null), predicate);
Assert.assertEquals(TestHostResourceProvider.Action.Delete, resourceProvider.getLastAction());
Assert.assertNull(resourceProvider.getLastRequest());
@@ -989,7 +989,7 @@ public class ClusterControllerImplTest {
}
@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(); // not needed for testing
}
@@ -1099,7 +1099,7 @@ public class ClusterControllerImplTest {
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
lastAction = Action.Delete;
lastRequest = null;
lastPredicate = predicate;
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
index 2d72cb0..d56ed44 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterKerberosDescriptorResourceProviderTest.java
@@ -626,7 +626,7 @@ public class ClusterKerberosDescriptorResourceProviderTest extends EasyMockSuppo
.toPredicate();
Predicate predicate = new AndPredicate(predicate1, predicate2);
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
verifyAll();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProviderTest.java
index bff15af..f00a21a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterPrivilegeResourceProviderTest.java
@@ -412,7 +412,7 @@ public class ClusterPrivilegeResourceProviderTest extends EasyMockSupport {
SecurityContextHolder.getContext().setAuthentication(authentication);
ResourceProvider provider = getResourceProvider(injector);
- provider.deleteResources(createPredicate(1L));
+ provider.deleteResources(new RequestImpl(null, null, null, null), createPredicate(1L));
verifyAll();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
index 7292be2..7f2ea7c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ClusterResourceProviderTest.java
@@ -761,12 +761,12 @@ public class ClusterResourceProviderTest {
// delete the cluster named Cluster102
Predicate predicate = new PredicateBuilder().property(
ClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID).equals("Cluster102").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// delete the cluster where id == 103
predicate = new PredicateBuilder().property(
ClusterResourceProvider.CLUSTER_ID_PROPERTY_ID).equals(103L).toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
Assert.assertNotNull(lastEvent);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
index 286b3cf..d7b45e0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ComponentResourceProviderTest.java
@@ -525,7 +525,7 @@ public class ComponentResourceProviderTest {
.property(ComponentResourceProvider.COMPONENT_COMPONENT_NAME_PROPERTY_ID)
.equals("Component100").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// verify
verify(managementController, service);
@@ -579,7 +579,7 @@ public class ComponentResourceProviderTest {
.equals("Component100").toPredicate();
try {
- provider.deleteResources(predicate1);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate1);
Assert.fail("Expected IllegalArgumentException exception.");
} catch (IllegalArgumentException e) {
//expected
@@ -594,7 +594,7 @@ public class ComponentResourceProviderTest {
.and().toPredicate();
try {
- provider.deleteResources(predicate2);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate2);
Assert.fail("Expected IllegalArgumentException exception.");
} catch (IllegalArgumentException e) {
//expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
index 5b9785e..2913cf5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
@@ -720,7 +720,7 @@ public class ConfigGroupResourceProviderTest {
.equals("Cluster100").and().property(ConfigGroupResourceProvider
.CONFIGGROUP_ID_PROPERTY_ID).equals(1L).toPredicate();
- resourceProvider.deleteResources(predicate);
+ resourceProvider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
Assert.assertNotNull(lastEvent);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
index 6f7db80..534a899 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigurationResourceProviderTest.java
@@ -338,7 +338,7 @@ public class ConfigurationResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(
ConfigurationResourceProvider.CONFIGURATION_CONFIG_TAG_PROPERTY_ID).equals("Configuration100").toPredicate();
try {
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
Assert.fail("Expected an UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
index 31bf191..df4d8ed 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/CredentialResourceProviderTest.java
@@ -818,7 +818,7 @@ public class CredentialResourceProviderTest {
}
}
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
try {
provider.getResources(request, predicate);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
index 39a0509..c4911c7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/FeedResourceProviderTest.java
@@ -193,7 +193,7 @@ public class FeedResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(FeedResourceProvider.FEED_NAME_PROPERTY_ID).equals("Feed1").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// verify
verify(service);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProviderTest.java
index 205f467..bab9394 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupPrivilegeResourceProviderTest.java
@@ -87,7 +87,7 @@ public class GroupPrivilegeResourceProviderTest extends EasyMockSupport {
public void testDeleteResources() throws Exception {
SecurityContextHolder.getContext().setAuthentication(TestAuthenticationFactory.createClusterAdministrator("user1", 2L));
GroupPrivilegeResourceProvider resourceProvider = new GroupPrivilegeResourceProvider();
- resourceProvider.deleteResources(createNiceMock(Predicate.class));
+ resourceProvider.deleteResources(new RequestImpl(null, null, null, null), createNiceMock(Predicate.class));
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
index 7d1bddf..90e86a7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/GroupResourceProviderTest.java
@@ -233,7 +233,7 @@ public class GroupResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(GroupResourceProvider.GROUP_GROUPNAME_PROPERTY_ID).
equals("engineering").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// verify
verify(managementController, response);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
index a2e1fda..683a235 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
@@ -453,7 +453,7 @@ public class HostComponentResourceProviderTest {
Predicate predicate = new PredicateBuilder().
property(HostComponentResourceProvider.HOST_COMPONENT_COMPONENT_NAME_PROPERTY_ID).equals("Component100").and().
property(HostComponentResourceProvider.HOST_COMPONENT_HOST_NAME_PROPERTY_ID).equals("Host100").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostKerberosIdentityResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostKerberosIdentityResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostKerberosIdentityResourceProviderTest.java
index 1b1b4ac..f3e1046 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostKerberosIdentityResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostKerberosIdentityResourceProviderTest.java
@@ -124,7 +124,7 @@ public class HostKerberosIdentityResourceProviderTest extends EasyMockSupport {
.property(HostKerberosIdentityResourceProvider.KERBEROS_IDENTITY_PRINCIPAL_NAME_PROPERTY_ID)
.equals("principal@REALM").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
index c16013a..9dac445 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostResourceProviderTest.java
@@ -1102,7 +1102,7 @@ public class HostResourceProviderTest extends EasyMockSupport {
Predicate predicate = new PredicateBuilder().property(HostResourceProvider.HOST_NAME_PROPERTY_ID).equals("Host100").
toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
index 1a74ac3..abfb1cd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/InstanceResourceProviderTest.java
@@ -177,7 +177,7 @@ public class InstanceResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(InstanceResourceProvider.INSTANCE_ID_PROPERTY_ID).equals("Instance1").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// verify
verify(service);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
index 8a12c13..c998274 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/LdapSyncEventResourceProviderTest.java
@@ -122,7 +122,7 @@ public class LdapSyncEventResourceProviderTest {
Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
Assert.assertEquals(1, resources.size());
- provider.deleteResources(null);
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
resources = provider.getResources(PropertyHelper.getReadRequest(), null);
Assert.assertEquals(0, resources.size());
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
index 26a5cff..d9ba614 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/MemberResourceProviderTest.java
@@ -252,7 +252,7 @@ public class MemberResourceProviderTest {
PredicateBuilder builder = new PredicateBuilder();
builder.property(MemberResourceProvider.MEMBER_GROUP_NAME_PROPERTY_ID).equals("engineering");
Predicate predicate = builder.toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// verify
verify(managementController, response);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java
index fb4454e..bcfae8d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/PermissionResourceProviderTest.java
@@ -57,18 +57,11 @@ public class PermissionResourceProviderTest {
reset(dao);
}
- @Test
+ @Test (expected = UnsupportedOperationException.class)
public void testCreateResources() throws Exception {
PermissionResourceProvider provider = new PermissionResourceProvider();
-
Request request = createNiceMock(Request.class);
-
- try {
- provider.createResources(request);
- Assert.fail("expected UnsupportedOperationException");
- } catch (UnsupportedOperationException e) {
- // expected
- }
+ provider.createResources(request);
}
@Test
@@ -103,29 +96,16 @@ public class PermissionResourceProviderTest {
verify(dao, permissionEntity, resourceTypeEntity);
}
- @Test
+ @Test (expected = UnsupportedOperationException.class)
public void testUpdateResources() throws Exception {
PermissionResourceProvider provider = new PermissionResourceProvider();
-
Request request = createNiceMock(Request.class);
-
- try {
- provider.updateResources(request, null);
- Assert.fail("expected UnsupportedOperationException");
- } catch (UnsupportedOperationException e) {
- // expected
- }
+ provider.updateResources(request, null);
}
- @Test
+ @Test (expected = UnsupportedOperationException.class)
public void testDeleteResources() throws Exception {
PermissionResourceProvider provider = new PermissionResourceProvider();
-
- try {
- provider.deleteResources(null);
- Assert.fail("expected UnsupportedOperationException");
- } catch (UnsupportedOperationException e) {
- // expected
- }
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
index d07ed76..a61af95 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
@@ -421,7 +421,7 @@ public class RepositoryVersionResourceProviderTest {
Assert.assertEquals(1, provider.getResources(getRequest, new AndPredicate(predicateStackName, predicateStackVersion)).size());
final Predicate predicate = new PredicateBuilder().property(RepositoryVersionResourceProvider.REPOSITORY_VERSION_ID_PROPERTY_ID).equals("1").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
Assert.assertEquals(0, provider.getResources(getRequest, new AndPredicate(predicateStackName, predicateStackVersion)).size());
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
index 42e75a7..d509fd3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestResourceProviderTest.java
@@ -882,7 +882,7 @@ public class RequestResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(RequestResourceProvider.REQUEST_ID_PROPERTY_ID).
equals("Request100").toPredicate();
try {
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
Assert.fail("Expected an UnsupportedOperationException");
} catch (UnsupportedOperationException e) {
// expected
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
index cb4d8aa..daeea27 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RequestScheduleResourceProviderTest.java
@@ -412,7 +412,7 @@ public class RequestScheduleResourceProviderTest {
.equals("Cluster100").and().property(RequestScheduleResourceProvider
.REQUEST_SCHEDULE_ID_PROPERTY_ID).equals(1L).toPredicate();
- resourceProvider.deleteResources(predicate);
+ resourceProvider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
Assert.assertNotNull(lastEvent);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java
index 23afa8f..56f7322 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RoleAuthorizationResourceProviderTest.java
@@ -31,7 +31,6 @@ import org.apache.ambari.server.controller.utilities.PropertyHelper;
import org.apache.ambari.server.orm.DBAccessor;
import org.apache.ambari.server.orm.InMemoryDefaultTestModule;
import org.apache.ambari.server.orm.dao.PermissionDAO;
-import org.apache.ambari.server.orm.dao.ResourceTypeDAO;
import org.apache.ambari.server.orm.dao.RoleAuthorizationDAO;
import org.apache.ambari.server.orm.entities.PermissionEntity;
import org.apache.ambari.server.orm.entities.RoleAuthorizationEntity;
@@ -197,6 +196,6 @@ public class RoleAuthorizationResourceProviderTest extends EasyMockSupport {
replayAll();
AmbariManagementController managementController = injector.getInstance(AmbariManagementController.class);
RoleAuthorizationResourceProvider provider = new RoleAuthorizationResourceProvider(managementController);
- provider.deleteResources(null);
+ provider.deleteResources(new RequestImpl(null, null, null, null), null);
}
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java
index 1c3d14a..f9f3187 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SchemaImplTest.java
@@ -63,7 +63,7 @@ public class SchemaImplTest {
}
@Override
- public RequestStatus deleteResources(Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
+ public RequestStatus deleteResources(Request request, Predicate predicate) throws SystemException, UnsupportedPropertyException, NoSuchResourceException, NoSuchParentResourceException {
return new RequestStatusImpl(null);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
index e113347..84f8124 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ServiceResourceProviderTest.java
@@ -58,7 +58,6 @@ import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import java.lang.reflect.Field;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -853,7 +852,7 @@ public class ServiceResourceProviderTest {
// delete the service named Service100
Predicate predicate = new PredicateBuilder().property(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and()
.property(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(serviceName).toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
@@ -901,7 +900,7 @@ public class ServiceResourceProviderTest {
// delete the service named Service100
Predicate predicate = new PredicateBuilder().property(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID).equals("Cluster100").and()
.property(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(serviceName).toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
@@ -962,7 +961,7 @@ public class ServiceResourceProviderTest {
.property(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(serviceName).toPredicate();
try {
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
Assert.fail("Expected exception deleting a service in a non-removable state.");
} catch (SystemException e) {
// expected
@@ -1070,7 +1069,7 @@ public class ServiceResourceProviderTest {
// delete the service named Service100
Predicate predicate = new PredicateBuilder().property(ServiceResourceProvider.SERVICE_CLUSTER_NAME_PROPERTY_ID).equals(clusterName).and()
.property(ServiceResourceProvider.SERVICE_SERVICE_NAME_PROPERTY_ID).equals(serviceName).toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
ResourceProviderEvent lastEvent = observer.getLastEvent();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SettingResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SettingResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SettingResourceProviderTest.java
index c133220..9054e4f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SettingResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/SettingResourceProviderTest.java
@@ -260,7 +260,7 @@ public class SettingResourceProviderTest {
@Test(expected = AuthorizationException.class)
public void testDeleteResources_noAuth() throws Exception {
mockControl.replay();
- resourceProvider.deleteResources(null);
+ resourceProvider.deleteResources(new RequestImpl(null, null, null, null), null);
}
@@ -268,7 +268,7 @@ public class SettingResourceProviderTest {
public void testDeleteResources_clusterUser() throws Exception {
setupAuthenticationForClusterUser();
mockControl.replay();
- resourceProvider.deleteResources(null);
+ resourceProvider.deleteResources(new RequestImpl(null, null, null, null), null);
}
@Test
@@ -280,7 +280,7 @@ public class SettingResourceProviderTest {
Predicate predicate = pb.begin().property(SETTING_NAME_PROPERTY_ID).equals(name).end().toPredicate();
dao.removeByName(name);
mockControl.replay();
- resourceProvider.deleteResources(predicate);
+ resourceProvider.deleteResources(new RequestImpl(null, null, null, null), predicate);
}
private Set<Resource> getResources_instance(SettingEntity entity, Request request) throws Exception {
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
index 435587d..2c187a9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/StageResourceProviderTest.java
@@ -136,17 +136,11 @@ public class StageResourceProviderTest {
verify(clusters, cluster);
}
- @Test
+ @Test(expected = UnsupportedOperationException.class)
public void testDeleteResources() throws Exception {
StageResourceProvider provider = new StageResourceProvider(managementController);
-
Predicate predicate = createNiceMock(Predicate.class);
- try {
- provider.deleteResources(predicate);
- fail("Expected UnsupportedOperationException");
- } catch (UnsupportedOperationException e) {
- // expected
- }
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java
index 96c6db4..904a0e9 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TargetClusterResourceProviderTest.java
@@ -225,7 +225,7 @@ public class TargetClusterResourceProviderTest {
Predicate predicate = new PredicateBuilder().property(TargetClusterResourceProvider.CLUSTER_NAME_PROPERTY_ID).equals("Cluster1").toPredicate();
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// verify
verify(service);
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java
index 587febe..91cfef8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/TaskResourceProviderTest.java
@@ -27,6 +27,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
@@ -49,7 +50,6 @@ import org.apache.ambari.server.orm.dao.ExecutionCommandDAO;
import org.apache.ambari.server.orm.dao.HostDAO;
import org.apache.ambari.server.orm.dao.HostRoleCommandDAO;
import org.apache.ambari.server.orm.entities.HostRoleCommandEntity;
-import org.apache.ambari.server.topology.LogicalRequest;
import org.apache.ambari.server.topology.TopologyManager;
import org.easymock.EasyMock;
import org.junit.Assert;
@@ -260,7 +260,7 @@ public class TaskResourceProviderTest {
verify(managementController, response);
}
- @Test
+ @Test(expected = UnsupportedOperationException.class)
public void testDeleteResources() throws Exception {
Resource.Type type = Resource.Type.Task;
@@ -275,15 +275,8 @@ public class TaskResourceProviderTest {
PropertyHelper.getKeyPropertyIds(type),
managementController);
- Predicate predicate = new PredicateBuilder().property(TaskResourceProvider.TASK_ID_PROPERTY_ID).equals("Task100").
- toPredicate();
- try {
- provider.deleteResources(predicate);
- Assert.fail("Expected an UnsupportedOperationException");
- } catch (UnsupportedOperationException e) {
- // expected
- }
-
+ Predicate predicate = new PredicateBuilder().property(TaskResourceProvider.TASK_ID_PROPERTY_ID).equals("Task100").toPredicate();
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
// verify
verify(managementController);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java
index c19e5ad..2ccbcda 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserAuthorizationResourceProviderTest.java
@@ -146,7 +146,7 @@ public class UserAuthorizationResourceProviderTest extends EasyMockSupport {
SecurityContextHolder.getContext().setAuthentication(TestAuthenticationFactory.createClusterAdministrator("user1", 2L));
AmbariManagementController managementController = injector.getInstance(AmbariManagementController.class);
UserAuthorizationResourceProvider provider = new UserAuthorizationResourceProvider(managementController);
- provider.deleteResources(null);
+ provider.deleteResources(createNiceMock(Request.class), null);
verifyAll();
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java
index 28a061c..d8bd566 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserPrivilegeResourceProviderTest.java
@@ -94,7 +94,7 @@ public class UserPrivilegeResourceProviderTest extends EasyMockSupport {
public void testDeleteResources() throws Exception {
SecurityContextHolder.getContext().setAuthentication(TestAuthenticationFactory.createClusterAdministrator("user1", 2L));
UserPrivilegeResourceProvider resourceProvider = new UserPrivilegeResourceProvider();
- resourceProvider.deleteResources(createNiceMock(Predicate.class));
+ resourceProvider.deleteResources(createNiceMock(Request.class), createNiceMock(Predicate.class));
}
@Test
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/UserResourceProviderTest.java
----------------------------------------------------------------------
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 3dd4ad2..dc22bb9 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
@@ -492,7 +492,7 @@ public class UserResourceProviderTest extends EasyMockSupport {
ResourceProvider provider = getResourceProvider(managementController);
- provider.deleteResources(createPredicate(requestedUsername));
+ provider.deleteResources(new RequestImpl(null, null, null, null), createPredicate(requestedUsername));
// verify
verifyAll();
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java
index b384b8a..aedac18 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ViewInstanceResourceProviderTest.java
@@ -397,7 +397,7 @@ public class ViewInstanceResourceProviderTest {
replay(viewregistry);
SecurityContextHolder.getContext().setAuthentication(authentication);
- provider.deleteResources(predicate);
+ provider.deleteResources(new RequestImpl(null, null, null, null), predicate);
verify(viewregistry);
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
index 2f05402..e9d8422 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetLayoutResourceProviderTest.java
@@ -343,7 +343,7 @@ public class WidgetLayoutResourceProviderTest {
expectLastCall();
replay(dao);
- provider.deleteResources(predicate);
+ provider.deleteResources(request, predicate);
WidgetLayoutEntity entity1 = entityCapture.getValue();
Assert.assertEquals(Long.valueOf(1), entity1.getId());
http://git-wip-us.apache.org/repos/asf/ambari/blob/36d2b0c9/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
index 8192f38..096a7bc 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/WidgetResourceProviderTest.java
@@ -419,7 +419,7 @@ public class WidgetResourceProviderTest {
expectLastCall();
replay(dao);
- provider.deleteResources(predicate);
+ provider.deleteResources(request, predicate);
WidgetEntity entity1 = entityCapture.getValue();
Assert.assertEquals(Long.valueOf(1), entity1.getId());
[2/2] ambari git commit: AMBARI-15888. Pass request object to delete
API in resource providers (ajit)
Posted by aj...@apache.org.
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 {