From 5c054a37283931731e6feb4fd5b1b99ad59f9058 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Tue, 15 Apr 2014 08:10:14 +0000
Subject: [PATCH] Code cleanup on from(Scope) - Replaced if...else.. by the switch(enum).
---
opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
index 854208f..1fbacbd 100644
--- a/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
+++ b/opendj-server3x-adapter/src/main/java/org/forgerock/opendj/adapter/server3x/Converters.java
@@ -588,18 +588,19 @@
* The server scope value.
* @return The SDK scope value.
*/
- public static SearchScope from(
- org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.Scope srvScope) {
- if (srvScope != null && srvScope.name() != null) {
- final String srvScopeName = srvScope.name().toLowerCase();
- if ("base_object".equals(srvScopeName)) {
+ public static SearchScope from(org.opends.server.admin.std.meta.VirtualAttributeCfgDefn.Scope srvScope) {
+ if (srvScope != null) {
+ switch (srvScope) {
+ case BASE_OBJECT:
return SearchScope.BASE_OBJECT;
- } else if ("single_level".equals(srvScopeName)) {
+ case SINGLE_LEVEL:
return SearchScope.SINGLE_LEVEL;
- } else if ("subordinate_subtree".equals(srvScopeName)) {
+ case SUBORDINATE_SUBTREE:
return SearchScope.SUBORDINATES;
- } else if ("whole_subtree".equals(srvScopeName)) {
+ case WHOLE_SUBTREE:
return SearchScope.WHOLE_SUBTREE;
+ default:
+ return null;
}
}
return null;
--
Gitblit v1.10.0