You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2018/11/28 23:01:30 UTC
[1/5] tomee git commit: jsonb was wrong,
so the payload was wrong as well
Repository: tomee
Updated Branches:
refs/heads/master 1d4f3a6fb -> f2f2808a9
jsonb was wrong, so the payload was wrong as well
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e5455e5c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e5455e5c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e5455e5c
Branch: refs/heads/master
Commit: e5455e5c46702dbae58e31b31230879be73b162b
Parents: 354b14a
Author: ivanjunckes <ij...@tomitribe.com>
Authored: Mon Nov 26 16:29:48 2018 -0200
Committer: ivanjunckes <ij...@tomitribe.com>
Committed: Mon Nov 26 16:29:48 2018 -0200
----------------------------------------------------------------------
.../org/superbiz/rest/WeatherServiceTest.java | 25 +++++---------------
1 file changed, 6 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/e5455e5c/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
index 0f87d6c..61adfe9 100644
--- a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
+++ b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
@@ -74,7 +74,7 @@ public class WeatherServiceTest {
.path(metricPath)
.accept(MediaType.APPLICATION_JSON)
.get(String.class);
- assertEquals("{\"weather_day_status\":{\"delegate\":{},\"unit\":\"none\",\"count\":1}}", metric);
+ assertEquals("{\"weather_day_status\":{\"count\":1}}", metric);
}
@Test
@@ -88,27 +88,14 @@ public class WeatherServiceTest {
final String expected = "{\n" +
" \"weather_day_status\": {\n" +
- " \"unit\": \"none\",\n" +
+ " \"description\": \"This metric shows the weather status of the day.\",\n" +
" \"displayName\": \"Weather Day Status\",\n" +
" \"name\": \"weather_day_status\",\n" +
- " \"typeRaw\": \"COUNTER\",\n" +
- " \"description\": \"This metric shows the weather status of the day.\",\n" +
- " \"type\": \"counter\",\n" +
- " \"value\": {\n" +
- " \"unit\": \"none\",\n" +
- " \"displayName\": \"Weather Day Status\",\n" +
- " \"name\": \"weather_day_status\",\n" +
- " \"tagsAsString\": \"\",\n" +
- " \"typeRaw\": \"COUNTER\",\n" +
- " \"description\": \"This metric shows the weather status of the day.\",\n" +
- " \"type\": \"counter\",\n" +
- " \"reusable\": false,\n" +
- " \"tags\": {\n" +
- " \n" +
- " }\n" +
- " },\n" +
" \"reusable\": false,\n" +
- " \"tags\": \"\"\n" +
+ " \"tags\": \"\",\n" +
+ " \"type\": \"counter\",\n" +
+ " \"typeRaw\": \"COUNTER\",\n" +
+ " \"unit\": \"none\"\n" +
" }\n" +
"}";
[4/5] tomee git commit: Improvement on the test
Posted by jg...@apache.org.
Improvement on the test
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/bf0251a4
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/bf0251a4
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/bf0251a4
Branch: refs/heads/master
Commit: bf0251a46f15205c0fc9f359c7162d61756dac4d
Parents: ee90765
Author: ivanjunckes <ij...@tomitribe.com>
Authored: Tue Nov 27 15:04:42 2018 -0200
Committer: ivanjunckes <ij...@tomitribe.com>
Committed: Tue Nov 27 15:04:42 2018 -0200
----------------------------------------------------------------------
.../test/java/org/superbiz/rest/WeatherServiceTest.java | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/bf0251a4/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
index f4eb0fe..f40042e 100644
--- a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
+++ b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
@@ -36,7 +36,9 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.StringReader;
import java.net.URL;
+import java.util.stream.Stream;
+import static junit.framework.TestCase.assertTrue;
import static org.junit.Assert.assertEquals;
@RunWith(Arquillian.class)
@@ -123,6 +125,13 @@ public class WeatherServiceTest {
"}";
JsonObject expectedJson = Json.createReader(new StringReader(expected)).readObject();
- assertEquals(expectedJson, metadataJson);
+ assertEquals(expectedJson.keySet().size(), metadataJson.keySet().size());
+
+ String[] expectedKeys = new String[]{"description", "displayName", "name", "reusable", "tags", "type", "typeRaw", "unit"};
+ Stream.of(expectedKeys).forEach((text) -> {
+ assertTrue("Expected: " + text
+ + " to be present in " + expected,
+ expectedJson.getJsonObject("weather_day_status").get(text) != null);
+ });
}
}
[2/5] tomee git commit: fixing versions
Posted by jg...@apache.org.
fixing versions
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/385f98a5
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/385f98a5
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/385f98a5
Branch: refs/heads/master
Commit: 385f98a5788c108d8dbce73ec1a2075d8da40709
Parents: e5455e5
Author: ivanjunckes <ij...@tomitribe.com>
Authored: Mon Nov 26 17:06:22 2018 -0200
Committer: ivanjunckes <ij...@tomitribe.com>
Committed: Mon Nov 26 17:06:22 2018 -0200
----------------------------------------------------------------------
examples/mp-metrics-counted/pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/385f98a5/examples/mp-metrics-counted/pom.xml
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-counted/pom.xml b/examples/mp-metrics-counted/pom.xml
index c5d10e8..57916d4 100644
--- a/examples/mp-metrics-counted/pom.xml
+++ b/examples/mp-metrics-counted/pom.xml
@@ -17,13 +17,13 @@
<dependency>
<groupId>org.apache.tomee</groupId>
<artifactId>javaee-api</artifactId>
- <version>8.0</version>
+ <version>${version.javaee-api}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.eclipse.microprofile.metrics</groupId>
<artifactId>microprofile-metrics-api</artifactId>
- <version>1.0</version>
+ <version>${microprofile.metrics.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
- <version>1.0.3.Final</version>
+ <version>${version.arquillian.bom}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -59,7 +59,7 @@
<plugin>
<groupId>org.apache.tomee.maven</groupId>
<artifactId>tomee-maven-plugin</artifactId>
- <version>8.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<configuration>
<tomeeClassifier>microprofile</tomeeClassifier>
<context>${artifactId}</context>
[3/5] tomee git commit: Fixing to use webtarget
Posted by jg...@apache.org.
Fixing to use webtarget
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/ee90765e
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/ee90765e
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/ee90765e
Branch: refs/heads/master
Commit: ee90765e427d570025e29d0f3515fcddbb1c39dc
Parents: 385f98a
Author: ivanjunckes <ij...@tomitribe.com>
Authored: Tue Nov 27 14:44:16 2018 -0200
Committer: ivanjunckes <ij...@tomitribe.com>
Committed: Tue Nov 27 14:44:16 2018 -0200
----------------------------------------------------------------------
.../org/superbiz/rest/WeatherServiceTest.java | 39 ++++++++++++++++----
1 file changed, 31 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/ee90765e/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
----------------------------------------------------------------------
diff --git a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
index 61adfe9..f4eb0fe 100644
--- a/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
+++ b/examples/mp-metrics-counted/src/test/java/org/superbiz/rest/WeatherServiceTest.java
@@ -16,18 +16,22 @@
*/
package org.superbiz.rest;
-import org.apache.cxf.jaxrs.client.WebClient;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import javax.json.Json;
import javax.json.JsonObject;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import java.io.StringReader;
@@ -49,11 +53,25 @@ public class WeatherServiceTest {
@ArquillianResource
private URL base;
+ private Client client;
+
+ @Before
+ public void before() {
+ this.client = ClientBuilder.newClient();
+ }
+
+ @After
+ public void after() {
+ this.client.close();
+ }
+
@Test
public void testCountedMetric() {
- final String message = WebClient.create(base.toExternalForm())
- .path("/weather/day/status")
+ WebTarget webTarget = this.client.target(this.base.toExternalForm());
+ final String message = webTarget.path("/weather/day/status")
+ .request()
.get(String.class);
+
assertEquals("Hi, today is a sunny day!", message);
final String metricPath = "/metrics/application/weather_day_status";
@@ -62,16 +80,19 @@ public class WeatherServiceTest {
}
private void assertPrometheusFormat(final String metricPath) {
- final String metric = WebClient.create(base.toExternalForm())
- .path(metricPath)
+ WebTarget webTarget = this.client.target(this.base.toExternalForm());
+ final String metric = webTarget.path(metricPath)
+ .request()
.accept(MediaType.TEXT_PLAIN)
.get(String.class);
assertEquals("# TYPE application:weather_day_status counter\napplication:weather_day_status 1.0\n", metric);
}
private void assertJsonFormat(final String metricPath) {
- final String metric = WebClient.create(base.toExternalForm())
- .path(metricPath)
+ WebTarget webTarget = this.client.target(this.base.toExternalForm());
+
+ final String metric = webTarget.path(metricPath)
+ .request()
.accept(MediaType.APPLICATION_JSON)
.get(String.class);
assertEquals("{\"weather_day_status\":{\"count\":1}}", metric);
@@ -79,8 +100,10 @@ public class WeatherServiceTest {
@Test
public void testCountedMetricMetadata() {
- final Response response = WebClient.create(base.toExternalForm())
+ WebTarget webTarget = this.client.target(this.base.toExternalForm());
+ final Response response = webTarget
.path("/metrics/application/weather_day_status")
+ .request()
.accept(MediaType.APPLICATION_JSON)
.options();
final String metaData = response.readEntity(String.class);
[5/5] tomee git commit: Merge branch 'metrics-counted-example-fixes'
of github.com:ivanjunckes/tomee
Posted by jg...@apache.org.
Merge branch 'metrics-counted-example-fixes' of github.com:ivanjunckes/tomee
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/f2f2808a
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/f2f2808a
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/f2f2808a
Branch: refs/heads/master
Commit: f2f2808a9ad7fb5ba186f60c2aef2b52e8f71db6
Parents: 1d4f3a6 bf0251a
Author: Jonathan Gallimore <jo...@jrg.me.uk>
Authored: Wed Nov 28 23:01:09 2018 +0000
Committer: Jonathan Gallimore <jo...@jrg.me.uk>
Committed: Wed Nov 28 23:01:09 2018 +0000
----------------------------------------------------------------------
examples/mp-metrics-counted/pom.xml | 8 +--
.../org/superbiz/rest/WeatherServiceTest.java | 75 ++++++++++++--------
2 files changed, 51 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/f2f2808a/examples/mp-metrics-counted/pom.xml
----------------------------------------------------------------------