From 7502e11a640c6eb92c4fc7604a4abf31c28745ed Mon Sep 17 00:00:00 2001
From: Matthew Swift <matthew.swift@forgerock.com>
Date: Mon, 20 Jun 2011 11:16:07 +0000
Subject: [PATCH] Fix OPENDJ-206: Add schema reading methods to SchemaBuilder and remove Schema/RootDSE methods from the Connection/AsynchronousConnection APIs
---
opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java | 75 -------------------------------------
1 files changed, 1 insertions(+), 74 deletions(-)
diff --git a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
index 46288cb..b1b34f4 100644
--- a/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
+++ b/opendj3/opendj-ldap-sdk/src/main/java/org/forgerock/opendj/ldap/AbstractConnection.java
@@ -23,6 +23,7 @@
*
*
* Copyright 2009-2010 Sun Microsystems, Inc.
+ * Portions copyright 2011 ForgeRock AS
*/
package org.forgerock.opendj.ldap;
@@ -42,7 +43,6 @@
import org.forgerock.opendj.ldap.requests.Requests;
import org.forgerock.opendj.ldap.requests.SearchRequest;
import org.forgerock.opendj.ldap.responses.*;
-import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldif.ConnectionEntryReader;
import com.forgerock.opendj.util.Validator;
@@ -260,79 +260,6 @@
/**
* {@inheritDoc}
*/
- public RootDSE readRootDSE() throws ErrorResultException,
- InterruptedException, UnsupportedOperationException,
- IllegalStateException
- {
- return RootDSE.readRootDSE(this);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public Schema readSchema(final DN name) throws ErrorResultException,
- InterruptedException, UnsupportedOperationException,
- IllegalStateException
- {
- return Schema.readSchema(this, name);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public Schema readSchema(final String name) throws ErrorResultException,
- InterruptedException, LocalizedIllegalArgumentException,
- UnsupportedOperationException, IllegalStateException
- {
- return readSchema(DN.valueOf(name));
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public Schema readSchemaForEntry(final DN name) throws ErrorResultException,
- InterruptedException, UnsupportedOperationException,
- IllegalStateException
- {
- return Schema.readSchemaForEntry(this, name);
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public Schema readSchemaForEntry(final String name)
- throws ErrorResultException, InterruptedException,
- LocalizedIllegalArgumentException, UnsupportedOperationException,
- IllegalStateException
- {
- return readSchemaForEntry(DN.valueOf(name));
- }
-
-
-
- /**
- * {@inheritDoc}
- */
- public Schema readSchemaForRootDSE() throws ErrorResultException,
- InterruptedException, UnsupportedOperationException,
- IllegalStateException
- {
- return readSchemaForEntry(DN.rootDN());
- }
-
-
-
- /**
- * {@inheritDoc}
- */
public Result search(final SearchRequest request,
final Collection<? super SearchResultEntry> entries)
throws ErrorResultException, InterruptedException,
--
Gitblit v1.10.0