From 8d98d66a588015d4f8c4fc9c77a2a1ba9544689c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 12 Feb 2015 12:19:43 +0000
Subject: [PATCH] (OPENDJ-1803) Remove com.forgerock.opendj.util.Pair
---
opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
index a6bc688..764f733 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/server/ServerManagedObject.java
@@ -22,8 +22,8 @@
*
*
* Copyright 2006-2009 Sun Microsystems, Inc.
+ * Portions Copyright 2015 ForgeRock AS.
*/
-
package org.forgerock.opendj.config.server;
import static com.forgerock.opendj.ldap.AdminMessages.*;
@@ -52,12 +52,10 @@
import org.forgerock.opendj.config.server.spi.ConfigDeleteListener;
import org.forgerock.opendj.config.server.spi.ConfigurationRepository;
import org.forgerock.opendj.ldap.DN;
+import org.forgerock.util.Pair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.forgerock.opendj.util.Pair;
-
-
/**
* A server-side managed object.
*
@@ -520,9 +518,8 @@
public DN getDN() {
if (configDN != null) {
return configDN;
- } else {
- return DN.rootDN();
}
+ return DN.rootDN();
}
/**
@@ -562,11 +559,10 @@
*/
public <T> T getPropertyValue(PropertyDefinition<T> d) {
Set<T> values = getPropertyValues(d);
- if (values.isEmpty()) {
- return null;
- } else {
+ if (!values.isEmpty()) {
return values.iterator().next();
}
+ return null;
}
/**
@@ -585,6 +581,7 @@
* If the property definition is not associated with this
* managed object's definition.
*/
+ @Override
@SuppressWarnings("unchecked")
public <T> SortedSet<T> getPropertyValues(PropertyDefinition<T> d) {
if (!properties.containsKey(d)) {
--
Gitblit v1.10.0