From d94f6d23898f7515e969517f85b8e626667a1e02 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Fri, 19 Sep 2014 08:56:38 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1536: Rename ErrorResultException to LdapException and remove ErrorResultIOException
---
opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
index 3a4bfe4..66e1812 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/client/ManagementContext.java
@@ -43,7 +43,7 @@
import org.forgerock.opendj.config.PropertyException;
import org.forgerock.opendj.config.SetRelationDefinition;
import org.forgerock.opendj.config.client.spi.Driver;
-import org.forgerock.opendj.ldap.ErrorResultException;
+import org.forgerock.opendj.ldap.LdapException;
/**
* Client management connection context.
@@ -85,13 +85,13 @@
* client-side or server-side constraint which cannot be
* satisfied (for example, if it is referenced by another
* managed object).
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <C extends ConfigurationClient, S extends Configuration> boolean deleteManagedObject(
ManagedObjectPath<?, ?> parent, InstantiableRelationDefinition<C, S> rd, String name)
throws ManagedObjectNotFoundException, OperationRejectedException,
- ErrorResultException {
+ LdapException {
return getDriver().deleteManagedObject(parent, rd, name);
}
@@ -121,12 +121,12 @@
* client-side or server-side constraint which cannot be
* satisfied (for example, if it is referenced by another
* managed object).
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <C extends ConfigurationClient, S extends Configuration> boolean deleteManagedObject(
ManagedObjectPath<?, ?> parent, OptionalRelationDefinition<C, S> rd) throws
- ManagedObjectNotFoundException, OperationRejectedException, ErrorResultException {
+ ManagedObjectNotFoundException, OperationRejectedException, LdapException {
return getDriver().deleteManagedObject(parent, rd);
}
@@ -157,13 +157,12 @@
* client-side or server-side constraint which cannot be
* satisfied (for example, if it is referenced by another
* managed object).
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <C extends ConfigurationClient, S extends Configuration> boolean deleteManagedObject(
ManagedObjectPath<?, ?> parent, SetRelationDefinition<C, S> rd, String name)
- throws ManagedObjectNotFoundException, OperationRejectedException,
- ErrorResultException {
+ throws ManagedObjectNotFoundException, OperationRejectedException, LdapException {
return getDriver().deleteManagedObject(parent, rd, name);
}
@@ -188,13 +187,13 @@
* @throws ManagedObjectNotFoundException
* If the requested managed object could not be found on the
* server.
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
@SuppressWarnings("unchecked")
public final <C extends ConfigurationClient, S extends Configuration> ManagedObject<? extends C> getManagedObject(
ManagedObjectPath<C, S> path) throws DefinitionDecodingException, ManagedObjectDecodingException,
- ManagedObjectNotFoundException, ErrorResultException {
+ ManagedObjectNotFoundException, LdapException {
// Be careful to handle the root configuration.
if (path.isEmpty()) {
return (ManagedObject<C>) getRootConfigurationManagedObject();
@@ -226,11 +225,11 @@
* @throws ManagedObjectNotFoundException
* If the requested managed object could not be found on the
* server.
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <P> P getPropertyValue(ManagedObjectPath<?, ?> path, PropertyDefinition<P> pd)
- throws DefinitionDecodingException, ErrorResultException, ManagedObjectNotFoundException {
+ throws DefinitionDecodingException, LdapException, ManagedObjectNotFoundException {
Set<P> values = getPropertyValues(path, pd);
if (values.isEmpty()) {
return null;
@@ -262,11 +261,11 @@
* @throws ManagedObjectNotFoundException
* If the requested managed object could not be found on the
* server.
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <P> SortedSet<P> getPropertyValues(ManagedObjectPath<?, ?> path, PropertyDefinition<P> pd)
- throws DefinitionDecodingException, ErrorResultException, ManagedObjectNotFoundException {
+ throws DefinitionDecodingException, LdapException, ManagedObjectNotFoundException {
return getDriver().getPropertyValues(path, pd);
}
@@ -311,12 +310,12 @@
* managed object's definition.
* @throws ManagedObjectNotFoundException
* If the parent managed object could not be found.
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <C extends ConfigurationClient, S extends Configuration> String[] listManagedObjects(
ManagedObjectPath<?, ?> parent, InstantiableRelationDefinition<C, S> rd) throws
- ManagedObjectNotFoundException, ErrorResultException {
+ ManagedObjectNotFoundException, LdapException {
return listManagedObjects(parent, rd, rd.getChildDefinition());
}
@@ -343,13 +342,13 @@
* managed object's definition.
* @throws ManagedObjectNotFoundException
* If the parent managed object could not be found.
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <C extends ConfigurationClient, S extends Configuration> String[] listManagedObjects(
ManagedObjectPath<?, ?> parent, InstantiableRelationDefinition<C, S> rd,
AbstractManagedObjectDefinition<? extends C, ? extends S> d) throws
- ManagedObjectNotFoundException, ErrorResultException {
+ ManagedObjectNotFoundException, LdapException {
return getDriver().listManagedObjects(parent, rd, d);
}
@@ -372,12 +371,12 @@
* managed object's definition.
* @throws ManagedObjectNotFoundException
* If the parent managed object could not be found.
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final <C extends ConfigurationClient, S extends Configuration> String[] listManagedObjects(
ManagedObjectPath<?, ?> parent, SetRelationDefinition<C, S> rd) throws
- ManagedObjectNotFoundException, ErrorResultException {
+ ManagedObjectNotFoundException, LdapException {
return getDriver().listManagedObjects(parent, rd, rd.getChildDefinition());
}
@@ -390,11 +389,11 @@
* <code>false</code> otherwise.
* @throws ManagedObjectNotFoundException
* If the parent managed object could not be found.
- * @throws ErrorResultException
+ * @throws LdapException
* If any other error occurs.
*/
public final boolean managedObjectExists(ManagedObjectPath<?, ?> path) throws ManagedObjectNotFoundException,
- ErrorResultException {
+ LdapException {
return getDriver().managedObjectExists(path);
}
--
Gitblit v1.10.0