J-396: "Monitoring Resource Method Statistics ignores same method path of different resources"

This is just test case to reproduce the problem. Un-Ignore the methods in MonitoringStatisticsLocatorTest.

Change-Id: I58aa0382b739fba06e946cc0a0b06af53d67ac8b

Author: shamoh

tests/e2e/src/test/java/org/glassfish/jersey/tests/e2e/server/monitoring/MonitoringStatisticsLocatorTest.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
@@ -44,21 +44,26 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Application;
 import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import javax.inject.Provider;
 
 import org.glassfish.jersey.server.ResourceConfig;
 import org.glassfish.jersey.server.ServerProperties;
+import org.glassfish.jersey.server.model.Resource;
 import org.glassfish.jersey.server.model.ResourceMethod;
 import org.glassfish.jersey.server.monitoring.MonitoringStatistics;
 import org.glassfish.jersey.server.monitoring.ResourceMethodStatistics;
 import org.glassfish.jersey.server.monitoring.ResourceStatistics;
+import org.glassfish.jersey.server.wadl.processor.WadlModelProcessor;
 import org.glassfish.jersey.test.JerseyTest;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -68,12 +73,13 @@
  * {@link ResourceMethodStatistics}.
  *
  * @author Miroslav Fuksa (miroslav.fuksa at oracle.com)
+ * @author Libor Kramolis (libor.kramolis at oracle.com)
  */
 public class MonitoringStatisticsLocatorTest extends JerseyTest {
 
     @Override
     protected Application configure() {
-        final ResourceConfig resourceConfig = new ResourceConfig(StatisticsResource.class);
+        final ResourceConfig resourceConfig = new ResourceConfig(StatisticsResource.class, AnotherResource.class);
         resourceConfig.property(ServerProperties.MONITORING_STATISTICS_ENABLED, true);
         resourceConfig.property(ServerProperties.APPLICATION_NAME, "testApp");
         return resourceConfig;
@@ -116,7 +122,6 @@ public String getUriStats() throws InterruptedException {
 
             String resp = "";
 
-
             for (Map.Entry<ResourceMethod, ResourceMethodStatistics> entry
                     : resourceStatistics.getResourceMethodStatistics().entrySet()) {
                 if (entry.getKey().getHttpMethod().equals("GET")) {
@@ -131,6 +136,132 @@ public String getUriStats() throws InterruptedException {
         public SubResource locator() {
             return new SubResource();
         }
+
+        @Path("hello")
+        @GET
+        @Produces("text/plain")
+        public String hello() {
+            return "Hello!";
+        }
+
+        @GET
+        @Path("resourceClassStatisticsWadlOptionsTest")
+        public String getResourceClassStatisticsWadlOptionsTest() {
+            return getResourceClassStatisticsTest(WadlModelProcessor.OptionsHandler.class.getName());
+        }
+
+        @GET
+        @Path("resourceClassStatisticsGenericOptionsTest")
+        public String getResourceClassStatisticsGenericOptionsTest() {
+            return getResourceClassStatisticsTest("org.glassfish.jersey.server.wadl.processor.OptionsMethodProcessor$GenericOptionsInflector");
+        }
+
+        @GET
+        @Path("resourceClassStatisticsPlainTextOptionsTest")
+        public String getResourceClassStatisticsPlainTestOptionsTest() {
+            return getResourceClassStatisticsTest("org.glassfish.jersey.server.wadl.processor.OptionsMethodProcessor$PlainTextOptionsInflector");
+        }
+
+        private String getResourceClassStatisticsTest(String resourceClassName) {
+            ResourceStatistics resourceMethodStatistics = findResourceClassStatistics(statistics.get(), resourceClassName);
+
+            boolean resourceHelloOptions = false;
+            boolean anotherHelloOptions = false;
+            boolean anotherXmlOptions = false;
+            for (final Map.Entry<ResourceMethod, ResourceMethodStatistics> entry : resourceMethodStatistics.getResourceMethodStatistics().entrySet()) {
+                final ResourceMethod resourceMethod = entry.getKey();
+                final String fullPath = getFullPath(resourceMethod);
+                if ("/resource/hello".equals(fullPath)) {
+                    resourceHelloOptions = true;
+                } else if ("/another/hello".equals(fullPath)) {
+                    anotherHelloOptions = true;
+                } else if ("/another/xml".equals(fullPath)) {
+                    anotherXmlOptions = true;
+                }
+            }
+            if (resourceHelloOptions && anotherHelloOptions && anotherXmlOptions) {
+                return "OK";
+            } else {
+                return "FAIL: /resource/hello=" + resourceHelloOptions + "; /another/hello=" + anotherHelloOptions +
+                        "; /another/xml=" + anotherXmlOptions;
+            }
+        }
+
+        @GET
+        @Path("uriStatisticsResourceHelloTest")
+        public String getUriStatisticsResourceHelloTest() {
+            return getUriStatisticsTest("/resource/hello");
+        }
+
+        @GET
+        @Path("uriStatisticsAnotherHelloTest")
+        public String getUriStatisticsAnotherHelloTest() {
+            return getUriStatisticsTest("/another/hello");
+        }
+
+        @GET
+        @Path("uriStatisticsAnotherXmlTest")
+        public String getUriStatisticsAnotherXmlTest() {
+            return getUriStatisticsTest("/another/xml");
+        }
+
+        private String getUriStatisticsTest(String uri) {
+            boolean plainTextOptions = false;
+            boolean wadlOptions = false;
+            boolean genericOptions = false;
+            final ResourceStatistics resourceStatistics = statistics.get().getUriStatistics().get(uri);
+            for (Map.Entry<ResourceMethod, ResourceMethodStatistics> entry : resourceStatistics.getResourceMethodStatistics().entrySet()) {
+                if (entry.getKey().getHttpMethod().equals("OPTIONS")) {
+                    final ResourceMethod resourceMethod = entry.getKey();
+                    final String producedTypes = resourceMethod.getProducedTypes().toString();
+                    if ("[text/plain]".equals(producedTypes)) {
+                        plainTextOptions = true;
+                    } else if ("[application/vnd.sun.wadl+xml]".equals(producedTypes)) {
+                        wadlOptions = true;
+                    } else if ("[*/*]".equals(producedTypes)) {
+                        genericOptions = true;
+                    }
+                }
+            }
+            if (plainTextOptions && wadlOptions && genericOptions) {
+                return "OK";
+            } else {
+                return "FAIL: [text/plain]=" + plainTextOptions + "; [application/vnd.sun.wadl+xml]=" + wadlOptions +
+                        "; [*/*]=" + genericOptions;
+            }
+        }
+
+        private ResourceStatistics findResourceClassStatistics(MonitoringStatistics monitoringStatistics, String resourceClassName) {
+            for (final Map.Entry<Class<?>, ResourceStatistics> entry : monitoringStatistics.getResourceClassStatistics().entrySet()) {
+                final Class<?> key = entry.getKey();
+                final String clazz = key.getName();
+
+                if (clazz.equals(resourceClassName)) {
+                    return entry.getValue();
+                }
+            }
+            return null;
+        }
+
+        private static String getFullPath(final ResourceMethod resourceMethod) {
+            final StringBuilder fullPath = new StringBuilder();
+            if (resourceMethod != null) {
+                prefixPath(fullPath, resourceMethod.getParent());
+            }
+            return fullPath.toString();
+        }
+
+        private static void prefixPath(final StringBuilder fullPath, final Resource parent) {
+            if (parent != null) {
+                String path = parent.getPath();
+                if (path.startsWith("/")) {
+                    path = path.substring(1);
+                }
+                fullPath.insert(0, "/" + path);
+                prefixPath(fullPath, parent.getParent());
+            }
+        }
+
     }
 
     public static class SubResource {
@@ -146,6 +277,23 @@ public SubResource subLocator() {
 
     }
 
+    @Path("/another")
+    public static class AnotherResource {
+        @Path("hello")
+        @GET
+        @Produces("text/plain")
+        public String sayHello() {
+            return "Hello, again.";
+        }
+
+        @Path("xml")
+        @GET
+        @Produces(MediaType.TEXT_XML)
+        public String sayXMLHello() {
+            return "<?xml version=\"1.0\"?><hello>World!</hello>";
+        }
+    }
+
     @Test
     public void test() throws InterruptedException {
         Response response = target().path("resource").request().get();
@@ -156,16 +304,26 @@ public void test() throws InterruptedException {
         Assert.assertEquals(200, response.getStatus());
         Assert.assertEquals("get", response.readEntity(String.class));
 
-
         response = target().path("resource/resource-locator").request().get();
         Assert.assertEquals(200, response.getStatus());
         Assert.assertEquals("get", response.readEntity(String.class));
 
-
         response = target().path("resource/resource-locator/sub").request().get();
         Assert.assertEquals(200, response.getStatus());
         Assert.assertEquals("get", response.readEntity(String.class));
 
+        response = target().path("resource/hello").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("Hello!", response.readEntity(String.class));
+
+        response = target().path("another/hello").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("Hello, again.", response.readEntity(String.class));
+
+        response = target().path("another/xml").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("<?xml version=\"1.0\"?><hello>World!</hello>", response.readEntity(String.class));
+
         Thread.sleep(600);
 
         response = target().path("resource").request().get();
@@ -175,6 +333,69 @@ public void test() throws InterruptedException {
         response = target().path("resource/uri").request().get();
         Assert.assertEquals(200, response.getStatus());
         Assert.assertEquals("getFound", response.readEntity(String.class));
+    }
+
+    @Test
+    @Ignore //J-396 reproducer
+    public void testResourceClassStatisticsWadlOptions() {
+        Response response = target().path("resource/resourceClassStatisticsWadlOptionsTest").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("OK", response.readEntity(String.class));
+    }
+
+    @Test
+    @Ignore //J-396 reproducer
+    public void testResourceClassStatisticsGenericOptions() {
+        Response response = target().path("resource/resourceClassStatisticsGenericOptionsTest").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("OK", response.readEntity(String.class));
+    }
+
+    @Test
+    @Ignore //J-396 reproducer
+    public void testResourceClassStatisticsPlainTextOptions() {
+        Response response = target().path("resource/resourceClassStatisticsPlainTextOptionsTest").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("OK", response.readEntity(String.class));
+    }
+
+    @Test
+    public void testUriStatisticsResourceHello() throws InterruptedException {
+        Response response = target().path("resource/hello").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("Hello!", response.readEntity(String.class));
+
+        Thread.sleep(600);
+
+        response = target().path("resource/uriStatisticsResourceHelloTest").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("OK", response.readEntity(String.class));
+    }
+
+    @Test
+    public void testUriStatisticsAnotherHello() throws InterruptedException {
+        Response response = target().path("another/hello").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("Hello, again.", response.readEntity(String.class));
 
+        Thread.sleep(600);
+
+        response = target().path("resource/uriStatisticsAnotherHelloTest").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("OK", response.readEntity(String.class));
+    }
+
+    @Test
+    public void testUriStatisticsAnotherXml() throws InterruptedException {
+        Response response = target().path("another/xml").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("<?xml version=\"1.0\"?><hello>World!</hello>", response.readEntity(String.class));
+
+        Thread.sleep(600);
+
+        response = target().path("resource/uriStatisticsAnotherXmlTest").request().get();
+        Assert.assertEquals(200, response.getStatus());
+        Assert.assertEquals("OK", response.readEntity(String.class));
     }
+
 }