Bug 1155693 - It is not possible to delete old resource/plugin config…

…uration histories using JBoss ON CLI Expose purgePluginConfigurationUpdates and purgeResourceConfigurationUpdates to remote API
rhq-project · Jan 13, 2015 · 63bcf37 · 63bcf37
1 parent 85c0fde
commit 63bcf37
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 20 deletions.
diff --git a/.../jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java b/.../jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerLocal.java
@@ -36,13 +36,15 @@
 import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
 import org.rhq.core.domain.configuration.composite.ConfigurationUpdateComposite;
 import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
+import org.rhq.core.domain.configuration.definition.ConfigurationTemplate;
 import org.rhq.core.domain.configuration.group.AbstractGroupConfigurationUpdate;
 import org.rhq.core.domain.configuration.group.GroupPluginConfigurationUpdate;
 import org.rhq.core.domain.configuration.group.GroupResourceConfigurationUpdate;
 import org.rhq.core.domain.criteria.PluginConfigurationUpdateCriteria;
 import org.rhq.core.domain.criteria.ResourceConfigurationUpdateCriteria;
 import org.rhq.core.domain.util.PageControl;
 import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.server.configuration.job.GroupPluginConfigurationUpdateJob;
 import org.rhq.enterprise.server.resource.ResourceNotFoundException;
 
 /**
@@ -216,16 +218,6 @@ ResourceConfigurationUpdate persistResourceConfigurationUpdateInNewTransaction(S
      */
     public void purgePluginConfigurationUpdate(Subject subject, int configurationUpdateId, boolean purgeInProgress);
 
-    /**
-     * This deletes one or more plugin configuration updates from the resource's plugin config history.
-     *
-     * @param subject                 the user who is requesting the purge
-     * @param configurationUpdateIds identifies the update records to be deleted
-     * @param purgeInProgress        if <code>true</code>, delete those even if
-     *                               {@link ConfigurationUpdateStatus#INPROGRESS in progress}
-     */
-    void purgePluginConfigurationUpdates(Subject subject, int[] configurationUpdateIds, boolean purgeInProgress);
-
     /**
      * This deletes the update information belonging to the {@link AbstractResourceConfigurationUpdate} object with the
      * given ID. Once this returns, the complete audit trail for that update will be gone and you will not be able to
@@ -244,16 +236,6 @@ ResourceConfigurationUpdate persistResourceConfigurationUpdateInNewTransaction(S
      */
     void purgeResourceConfigurationUpdate(Subject subject, int configurationUpdateId, boolean purgeInProgress);
 
-    /**
-     * This deletes one or more configuration updates from the resource's configuration history.
-     *
-     * @param subject                 the user who is requesting the purge
-     * @param configurationUpdateIds identifies the update records to be deleted
-     * @param purgeInProgress        if <code>true</code>, delete those even if
-     *                               {@link ConfigurationUpdateStatus#INPROGRESS in progress}
-     */
-    void purgeResourceConfigurationUpdates(Subject subject, int[] configurationUpdateIds, boolean purgeInProgress);
-
     /**
      * Merge the specified configuration update into the DB.
      *

diff --git a/...jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java b/...jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java
@@ -25,6 +25,7 @@
 
 import org.rhq.core.domain.auth.Subject;
 import org.rhq.core.domain.configuration.Configuration;
+import org.rhq.core.domain.configuration.ConfigurationUpdateStatus;
 import org.rhq.core.domain.configuration.PluginConfigurationUpdate;
 import org.rhq.core.domain.configuration.ResourceConfigurationUpdate;
 import org.rhq.core.domain.configuration.definition.ConfigurationDefinition;
@@ -33,7 +34,9 @@
 import org.rhq.core.domain.criteria.GroupPluginConfigurationUpdateCriteria;
 import org.rhq.core.domain.criteria.GroupResourceConfigurationUpdateCriteria;
 import org.rhq.core.domain.util.PageList;
+import org.rhq.enterprise.server.authz.PermissionException;
 import org.rhq.enterprise.server.resource.ResourceNotFoundException;
+import org.rhq.enterprise.server.rest.BadArgumentException;
 
 /**
  * The configuration manager which allows you to request resource configuration changes, view current resource
@@ -317,4 +320,26 @@ ConfigurationDefinition getResourceConfigurationDefinitionWithTemplatesForResour
     @Deprecated
     Configuration translateResourceConfiguration(Subject subject, int resourceId, Configuration configuration,
         boolean fromStructured) throws ResourceNotFoundException;
+
+    /**
+     * This deletes one or more configuration updates from the resource's configuration history.
+     *
+     * @param subject                 the user who is requesting the purge
+     * @param configurationUpdateIds identifies the update records to be deleted
+     * @param purgeInProgress        if <code>true</code>, delete those even if
+     *                               {@link ConfigurationUpdateStatus#INPROGRESS in progress}
+     * @since 4.14
+     */
+    void purgeResourceConfigurationUpdates(Subject subject, int[] configurationUpdateIds, boolean purgeInProgress);
+
+    /**
+     * This deletes one or more plugin configuration updates from the resource's plugin config history.
+     *
+     * @param subject                 the user who is requesting the purge
+     * @param configurationUpdateIds identifies the update records to be deleted
+     * @param purgeInProgress        if <code>true</code>, delete those even if
+     *                               {@link ConfigurationUpdateStatus#INPROGRESS in progress}
+     * @since 4.14
+     */
+    void purgePluginConfigurationUpdates(Subject subject, int[] configurationUpdateIds, boolean purgeInProgress);
 }