From 101f3a4e573e376a4525cb9f742a0c87aee56071 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 07 Mar 2016 15:04:02 +0000
Subject: [PATCH] OPENDJ-1342 Migrate AVA, RDN, and DN classes: Switched imports

---
 opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index 7f5b1f0..8e10062 100644
--- a/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server-legacy/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -121,15 +121,15 @@
 
     /**
      * Converts from OpenDJ LDAP SDK {@link DN} to OpenDJ server
-     * {@link org.opends.server.types.DN}.
+     * {@link org.forgerock.opendj.ldap.DN}.
      *
      * @param dn
      *          value to convert
      * @return the converted value
      */
-    public static org.opends.server.types.DN to(final DN dn) {
+    public static org.forgerock.opendj.ldap.DN to(final DN dn) {
         try {
-            return org.opends.server.types.DN.valueOf(dn.toString());
+            return org.forgerock.opendj.ldap.DN.valueOf(dn.toString());
         } catch (Exception e) {
             throw new IllegalStateException(e.getMessage(), e);
         }
@@ -137,17 +137,17 @@
 
     /**
      * Converts a set of OpenDJ LDAP SDK {@link DN} to a set of
-     * OpenDJ server {@link org.opends.server.types.DN}.
+     * OpenDJ server {@link org.forgerock.opendj.ldap.DN}.
      *
      * @param dnSet
      *          set to convert
      * @return the converted set
      */
-    public static SortedSet<org.opends.server.types.DN> to(final SortedSet<DN> dnSet) {
+    public static SortedSet<org.forgerock.opendj.ldap.DN> to(final SortedSet<DN> dnSet) {
         try {
-            SortedSet<org.opends.server.types.DN> newSet = new TreeSet<>();
+            SortedSet<org.forgerock.opendj.ldap.DN> newSet = new TreeSet<>();
             for (DN dn : dnSet) {
-                newSet.add(org.opends.server.types.DN.valueOf(dn.toString()));
+                newSet.add(org.forgerock.opendj.ldap.DN.valueOf(dn.toString()));
             }
             return newSet;
         } catch (Exception e) {
@@ -157,17 +157,17 @@
 
     /**
      * Converts an array of OpenDJ LDAP SDK {@link DN} to an array of
-     * OpenDJ server {@link org.opends.server.types.DN}.
+     * OpenDJ server {@link org.forgerock.opendj.ldap.DN}.
      *
      * @param dns
      *          array of values to convert
      * @return the converted array
      */
-    public static org.opends.server.types.DN[] to(final DN[] dns) {
+    public static org.forgerock.opendj.ldap.DN[] to(final DN[] dns) {
         try {
-            org.opends.server.types.DN[] newDns = new org.opends.server.types.DN[dns.length];
+            org.forgerock.opendj.ldap.DN[] newDns = new org.forgerock.opendj.ldap.DN[dns.length];
             for (int i = 0; i < dns.length; i++) {
-                newDns[i] = org.opends.server.types.DN.valueOf(dns[i].toString());
+                newDns[i] = org.forgerock.opendj.ldap.DN.valueOf(dns[i].toString());
             }
             return newDns;
         } catch (Exception e) {
@@ -177,15 +177,15 @@
 
     /**
      * Converts from OpenDJ LDAP SDK {@link RDN} to OpenDJ server
-     * {@link org.opends.server.types.RDN}.
+     * {@link org.forgerock.opendj.ldap.RDN}.
      *
      * @param rdn
      *          value to convert
      * @return the converted value
      */
-    public static org.opends.server.types.RDN to(final RDN rdn) {
+    public static org.forgerock.opendj.ldap.RDN to(final RDN rdn) {
         try {
-            return org.opends.server.types.RDN.valueOf(rdn.toString());
+            return org.forgerock.opendj.ldap.RDN.valueOf(rdn.toString());
         } catch (Exception e) {
             throw new IllegalStateException(e.getMessage(), e);
         }
@@ -607,14 +607,14 @@
 
 
     /**
-     * Converts from OpenDJ server {@link org.opends.server.types.DN} to OpenDJ
+     * Converts from OpenDJ server {@link org.forgerock.opendj.ldap.DN} to OpenDJ
      * LDAP SDK {@link DN}.
      *
      * @param dn
      *            value to convert
      * @return the converted value
      */
-    public static DN from(final org.opends.server.types.DN dn) {
+    public static DN from(final org.forgerock.opendj.ldap.DN dn) {
         try {
             return DN.valueOf(dn.toString());
         } catch (Exception e) {
@@ -651,7 +651,7 @@
             }
         }
         final LocalizableMessageBuilder errorMsg = operation.getErrorMessage();
-        final org.opends.server.types.DN matchedDN = operation.getMatchedDN();
+        final DN matchedDN = operation.getMatchedDN();
         result.setDiagnosticMessage(errorMsg != null ? errorMsg.toString() : null);
         result.setMatchedDN(matchedDN != null ? matchedDN.toString() : null);
         if (result.isSuccess()) {

--
Gitblit v1.10.0