From 51e5d65834504efd1410ec445fc060498c01a7c3 Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Thu, 16 Jan 2014 00:19:43 +0000
Subject: [PATCH] Fix build break from previous commit:
---
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java | 26 ++++++------
opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java | 6 +-
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java | 26 ++++++------
opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java | 7 ---
4 files changed, 30 insertions(+), 35 deletions(-)
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java
index 59f88b0..6d44167 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/AbstractDataProvider.java
@@ -32,7 +32,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.ldap.DN;
-import org.opends.server.types.DirectoryException;
+import org.forgerock.opendj.ldap.ErrorResultException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -61,7 +61,7 @@
* {@code true} if the entry was successfully retrieved.
*/
@Override
- public boolean containsEntry(final DN dn) throws DirectoryException {
+ public boolean containsEntry(final DN dn) throws ErrorResultException {
return getEntry(dn) != null;
}
@@ -88,7 +88,7 @@
* that change notification is not supported.
*/
@Override
- public boolean supportsChangeNotification(final DN baseDN) throws DirectoryException {
+ public boolean supportsChangeNotification(final DN baseDN) throws ErrorResultException {
return false;
}
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
index 20d6bf9..3a28a8e 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProvider.java
@@ -30,8 +30,8 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
+import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.RequestHandler;
-import org.opends.server.types.DirectoryException;
/**
* An entry container which provides the content of one or more sub-trees.
@@ -81,12 +81,12 @@
* The DN of the entry.
* @return {@code true} if this data provider contains the specified entry,
* or {@code false} if it does not.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If a problem occurs while trying to make the determination,
* or if {@code dn} is not a DN equal to or subordinate to one
* of the base DNs managed by this data provider.
*/
- boolean containsEntry(DN dn) throws DirectoryException;
+ boolean containsEntry(DN dn) throws ErrorResultException;
/**
* Deregisters an event listener from this data provider.
@@ -133,12 +133,12 @@
* The DN of the entry.
* @return The requested entry, or {@code null} if this data provider does
* not contain the specified entry.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If a problem occurs while trying to retrieve the entry, or if
* {@code dn} is not a DN equal to or subordinate to one of the
* base DNs managed by this data provider.
*/
- Entry getEntry(DN dn) throws DirectoryException;
+ Entry getEntry(DN dn) throws ErrorResultException;
/**
* Returns the current status of the provided base DN in this data provider.
@@ -146,11 +146,11 @@
* @param baseDN
* The base DN in this data provider.
* @return The current status of the provided base DN in this data provider.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by this
* data provider.
*/
- DataProviderStatus getStatus(DN baseDN) throws DirectoryException;
+ DataProviderStatus getStatus(DN baseDN) throws ErrorResultException;
/**
* Returns an unmodifiable set containing the OIDs of the controls that may
@@ -160,11 +160,11 @@
* The base DN in this data provider.
* @return An unmodifiable set containing the OIDs of the controls that may
* be supported by the provided base DN in this data provider.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by this
* data provider.
*/
- Set<String> getSupportedControls(DN baseDN) throws DirectoryException;
+ Set<String> getSupportedControls(DN baseDN) throws ErrorResultException;
/**
* Returns an unmodifiable set containing the OIDs of the features that may
@@ -174,11 +174,11 @@
* The base DN in this data provider.
* @return An unmodifiable set containing the OIDs of the features that may
* be supported by the provided base DN in this data provider.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by this
* data provider.
*/
- Set<String> getSupportedFeatures(DN baseDN) throws DirectoryException;
+ Set<String> getSupportedFeatures(DN baseDN) throws ErrorResultException;
/**
* Registers an event listener with this data provider.
@@ -241,10 +241,10 @@
* The base DN in this data provider.
* @return {@code true} if the provided base DN in this data provider
* supports change notification.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by this
* data provider.
*/
- boolean supportsChangeNotification(DN baseDN) throws DirectoryException;
+ boolean supportsChangeNotification(DN baseDN) throws ErrorResultException;
}
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
index b502776..2d46bb4 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderConnection.java
@@ -30,8 +30,8 @@
import org.forgerock.opendj.ldap.DN;
import org.forgerock.opendj.ldap.Entry;
+import org.forgerock.opendj.ldap.ErrorResultException;
import org.forgerock.opendj.ldap.RequestHandler;
-import org.opends.server.types.DirectoryException;
/**
* A connection to a data provider. When a connection is no longer needed it
@@ -53,12 +53,12 @@
* The DN of the entry.
* @return {@code true} if the underlying data provider contains the
* specified entry, or {@code false} if it does not.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If a problem occurs while trying to make the determination,
* or if {@code dn} is not a DN equal to or subordinate to one
* of the base DNs managed by the underlying data provider.
*/
- boolean containsEntry(DN dn) throws DirectoryException;
+ boolean containsEntry(DN dn) throws ErrorResultException;
/**
* Deregisters an event listener from the underlying data provider.
@@ -84,12 +84,12 @@
* The DN of the entry.
* @return The requested entry, or {@code null} if the underlying data
* provider does not contain the specified entry.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If a problem occurs while trying to retrieve the entry, or if
* {@code dn} is not a DN equal to or subordinate to one of the
* base DNs managed by the underlying data provider.
*/
- Entry getEntry(DN dn) throws DirectoryException;
+ Entry getEntry(DN dn) throws ErrorResultException;
/**
* Returns the current status of the provided base DN in the underlying data
@@ -99,11 +99,11 @@
* The base DN in the underlying data provider.
* @return The current status of the provided base DN in the underlying data
* provider.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by the
* underlying data provider.
*/
- DataProviderStatus getStatus(DN baseDN) throws DirectoryException;
+ DataProviderStatus getStatus(DN baseDN) throws ErrorResultException;
/**
* Returns an unmodifiable set containing the OIDs of the controls that may
@@ -114,11 +114,11 @@
* @return An unmodifiable set containing the OIDs of the controls that may
* be supported by the provided base DN in the underlying data
* provider.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by the
* underlying data provider.
*/
- Set<String> getSupportedControls(DN baseDN) throws DirectoryException;
+ Set<String> getSupportedControls(DN baseDN) throws ErrorResultException;
/**
* Returns an unmodifiable set containing the OIDs of the features that may
@@ -129,11 +129,11 @@
* @return An unmodifiable set containing the OIDs of the features that may
* be supported by the provided base DN in the underlying data
* provider.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by the
* underlying data provider.
*/
- Set<String> getSupportedFeatures(DN baseDN) throws DirectoryException;
+ Set<String> getSupportedFeatures(DN baseDN) throws ErrorResultException;
/**
* Registers an event listener with the underlying data provider.
@@ -151,9 +151,9 @@
* The base DN in the underlying data provider.
* @return {@code true} if the provided base DN in the underlying data
* provider supports change notification.
- * @throws DirectoryException
+ * @throws ErrorResultException
* If {@code baseDN} is not one of the base DNs managed by the
* underlying data provider.
*/
- boolean supportsChangeNotification(DN baseDN) throws DirectoryException;
+ boolean supportsChangeNotification(DN baseDN) throws ErrorResultException;
}
diff --git a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java
index d81daa3..2241b4e 100644
--- a/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java
+++ b/opendj-server/src/main/java/org/forgerock/opendj/server/core/DataProviderFactory.java
@@ -30,7 +30,6 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.config.server.ConfigException;
-import org.opends.server.types.InitializationException;
/**
* A factory for creating data provider instances.
@@ -59,13 +58,9 @@
* @throws ConfigException
* If an unrecoverable problem arises during initialization of
* the data provider as a result of the server configuration.
- * @throws InitializationException
- * If a problem occurs during initialization of the data
- * provider that is not related to the server configuration.
* @see DataProvider#startDataProvider()
*/
- DataProvider createDataProvider(DataProviderID id, T configuration) throws ConfigException,
- InitializationException;
+ DataProvider createDataProvider(DataProviderID id, T configuration) throws ConfigException;
/**
* Indicates whether the provided configuration is acceptable for creating
--
Gitblit v1.10.0