Sergey Gotliv has uploaded a new change for review.

Change subject: restapi: Simplify "combine" implementation in LinkHelper
......................................................................

restapi: Simplify "combine" implementation in LinkHelper

Change-Id: I21615f3036083fef2f83cc3cbc67f678a9b406ff
Signed-off-by: Sergey Gotliv <sgot...@redhat.com>
---
M 
backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
1 file changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/35/26935/1

diff --git 
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
 
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
index 227640c..4b9f360 100644
--- 
a/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
+++ 
b/backend/manager/modules/restapi/interface/definition/src/main/java/org/ovirt/engine/api/utils/LinkHelper.java
@@ -27,6 +27,7 @@
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.api.model.ActionableResource;
 import org.ovirt.engine.api.model.ActionsBuilder;
 import org.ovirt.engine.api.model.AffinityGroup;
@@ -932,13 +933,7 @@
      * @return the combined head and tail
      */
     public static String combine(String head, String tail) {
-        if (head.endsWith("/")) {
-            head = head.substring(0, head.length() - 1);
-        }
-        if (tail.startsWith("/")) {
-            tail = tail.substring(1);
-        }
-        return head + "/" + tail;
+        return StringUtils.removeEnd(head, "/") + "/" + 
StringUtils.removeStart(tail, "/");
     }
 
     /**


-- 
To view, visit http://gerrit.ovirt.org/26935
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I21615f3036083fef2f83cc3cbc67f678a9b406ff
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sergey Gotliv <sgot...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to