Merge "Path formatting fixed - double slash eliminated."

Author: Marek Potociar

core-server/src/main/java/org/glassfish/jersey/server/internal/monitoring/MonitoringStatisticsImpl.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-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
@@ -110,14 +110,21 @@ public int compare(final Class<?> o1, final Class<?> o2) {
             for (final Resource resource : resourceModel.getRootResources()) {
                 processResource(resource, "");
                 for (final Resource child : resource.getChildResources()) {
-                    processResource(child, "/" + resource.getPath());
+                    final String path = resource.getPath();
+                    processResource(child, path.startsWith("/") ? path : "/" + path);
                 }
             }
 
         }
 
         private void processResource(final Resource resource, final String pathPrefix) {
-            uriStatistics.put(pathPrefix + "/" + resource.getPath(), new ResourceStatisticsImpl.Builder(resource, methodFactory));
+            final StringBuilder pathSB = new StringBuilder(pathPrefix);
+            if (!pathPrefix.endsWith("/") && !resource.getPath().startsWith("/")) {
+                pathSB.append("/");
+            }
+            pathSB.append(resource.getPath());
+
+            uriStatistics.put(pathSB.toString(), new ResourceStatisticsImpl.Builder(resource, methodFactory));
 
             for (final ResourceMethod resourceMethod : resource.getResourceMethods()) {
                 getOrCreateResourceBuilder(resourceMethod).addMethod(resourceMethod);

core-server/src/test/java/org/glassfish/jersey/server/internal/monitoring/MonitoringStatisticsTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2013-2014 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013-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
@@ -70,7 +70,7 @@
  */
 public class MonitoringStatisticsTest {
 
-    @Path("test-resource")
+    @Path("/test-resource")
     public static class TestResource {
 
         @GET
@@ -109,7 +109,7 @@ public String get() {
         public void post() {
         }
 
-        @Path("world")
+        @Path("/world")
         @GET
         public String childGet() {
             return "hello-world";
@@ -146,7 +146,7 @@ private MonitoringStatisticsImpl getSimpleStats() {
 
     private MonitoringStatisticsImpl.Builder getProgStats() {
         final Resource.Builder testBuilder = Resource.builder(TestResource.class);
-        testBuilder.addChildResource("prog-child").addMethod("GET").handledBy(MyInflector.class);
+        testBuilder.addChildResource("/prog-child").addMethod("GET").handledBy(MyInflector.class);
         final List<Resource> resources = Lists.newArrayList(testBuilder.build(),
                 Resource.from(HelloResource.class));
         final Resource.Builder prog = Resource.builder("prog");