Merge "JERSEY-2753: "UriBuilder should leave relative path relative""

Author: japod

core-common/src/main/java/org/glassfish/jersey/uri/UriTemplate.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -921,7 +921,9 @@ private static String createURIWithStringValues(
             sb.append(':');
         }
 
+        boolean hasAuthority = false;
         if (notEmpty(userInfo) || notEmpty(host) || notEmpty(port)) {
+            hasAuthority = true;
             sb.append("//");
 
             if (notEmpty(userInfo)) {
@@ -942,6 +944,7 @@ private static String createURIWithStringValues(
                         offset, false, mapValues, sb);
             }
         } else if (notEmpty(authority)) {
+            hasAuthority = true;
             sb.append("//");
 
             offset = createUriComponent(UriComponent.Type.AUTHORITY, authority, values,
@@ -950,7 +953,7 @@ private static String createURIWithStringValues(
 
         if (notEmpty(path) || notEmpty(query) || notEmpty(fragment)) {
             // make sure we append at least the root path if only query or fragment is present
-            if (sb.length() > 0 && (path == null || path.isEmpty() || path.charAt(0) != '/')) {
+            if (hasAuthority && (path == null || path.isEmpty() || path.charAt(0) != '/')) {
                 sb.append('/');
             }
 

core-common/src/main/java/org/glassfish/jersey/uri/internal/JerseyUriBuilder.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2010-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2010-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -870,7 +870,7 @@ public String toTemplate() {
             }
 
             if (path.length() > 0) {
-                if (sb.length() > 0 && path.charAt(0) != '/') {
+                if (hasAuthority && path.charAt(0) != '/') {
                     sb.append("/");
                 }
                 sb.append(path);

core-common/src/test/java/org/glassfish/jersey/uri/internal/JerseyUriBuilderTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2011-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2011-2015 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -187,6 +187,16 @@ public void testEmptyUriString() throws URISyntaxException {
         // it is not possible to create a java.net.URI from this builder if SSP is empty
     }
 
+    // Reproducer for JERSEY-2753
+    @Test
+    public void testUriBuilderShouldLeaveRelativePathRelative() {
+        UriBuilder builder = JerseyUriBuilder.fromPath("");
+        builder.scheme("http");
+        builder.replacePath("path");
+
+        assertEquals("http:path", builder.build().toString());
+    }
+
     @Test
     public void testToTemplate() throws URISyntaxException {
         JerseyUriBuilder ub = new JerseyUriBuilder()