fix resource location

johnmcclean · johnmcclean · commit b37a44edd7dc · 2016-08-10T15:04:15.000+01:00
diff --git a/gradle.properties b/gradle.properties
@@ -1,8 +1,8 @@
 version=0.88
-springVersion=4.2.7.RELEASE
-springBootVersion=1.3.6.RELEASE
-jerseyVersion=2.22.2
-grizzlyVersion=2.3.24
+springVersion=4.3.2.RELEASE
+springBootVersion=1.4.0.RELEASE
+jerseyVersion=2.23.2
+grizzlyVersion=2.3.26
 cyclopsReactVersion=1.0.0-RC4
 cyclopsVersion=8.0.1
 hamcrestVersion=1.3
@@ -27,5 +27,5 @@ ebayCORSVersion=1.0.1
 dbcp2Version=2.1.1
 log4jVersion=1.2.17
 s3Version=1.10.42
-tomcatVersion=9.0.0.M6
+tomcatVersion=9.0.0.M9
 commonsIOVersion=2.5
diff --git a/micro-event-metrics/src/main/resources/META-INF/services/com.aol.micro.server.Plugin b/micro-event-metrics/src/main/resources/META-INF/services/com.aol.micro.server.Plugin
diff --git a/micro-event-metrics/src/test/java/app/event/metrics/com/aol/micro/server/EventRunnerTest.java b/micro-event-metrics/src/test/java/app/event/metrics/com/aol/micro/server/EventRunnerTest.java
@@ -48,12 +48,15 @@ public void runAppAndBasicTest() throws InterruptedException, ExecutionException
 
         String json = rest.getJson("http://localhost:8080/event-app/status/counters");
         Map<String, Integer> map = JacksonUtil.convertFromJson(json, Map.class);
-        assertThat(map.get("com.aol.micro.server.event.metrics.MetricsCatcher.jobs-completed-count"), greaterThan(1));
+
+        assertThat(json, map.get("com.aol.micro.server.event.metrics.MetricsCatcher.jobs-completed-count"),
+                   greaterThan(1));
 
         String json2 = rest.getJson("http://localhost:8080/event-app/status/meters");
         Map<String, Integer> map2 = JacksonUtil.convertFromJson(json2, Map.class);
 
-        assertThat(map2.get("com.aol.micro.server.event.metrics.MetricsCatcherrequest-start-default"), greaterThan(0));
+        assertThat(json2, map2.get("com.aol.micro.server.event.metrics.MetricsCatcher.request-start-default"),
+                   greaterThan(0));
 
     }
 
diff --git a/micro-event-metrics/src/test/java/com/aol/micro/server/testing/RestAgent.java b/micro-event-metrics/src/test/java/com/aol/micro/server/testing/RestAgent.java
@@ -0,0 +1,55 @@
+package com.aol.micro.server.testing;
+
+import java.util.List;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+
+import com.aol.micro.server.rest.jackson.JacksonUtil;
+
+public class RestAgent {
+
+	
+	public String getJson(String url) {
+
+		Client client = ClientBuilder.newClient();
+
+		WebTarget resource = client.target(url);
+
+		Builder request = resource.request();
+		request.accept(MediaType.APPLICATION_JSON);
+
+		return request.get(String.class);
+
+	}
+	
+	public String get(String url) {
+
+		Client client = ClientBuilder.newClient();
+
+		WebTarget resource = client.target(url);
+
+		Builder request = resource.request();
+		request.accept(MediaType.TEXT_PLAIN);
+
+		return request.get(String.class);
+
+	}
+
+	public<T> T post(String url, Object payload,Class<T> type) {
+		Client client = ClientBuilder.newClient();
+
+		WebTarget resource = client.target(url);
+
+		Builder request = resource.request();
+		request.accept(MediaType.APPLICATION_JSON);
+
+		return request.post(Entity.entity(JacksonUtil.serializeToJson(payload),MediaType.APPLICATION_JSON), type);
+	}
+	
+
+}
