Mercurial > hg > thermostat-ng > web-client

changeset 139:8f45d0870bfe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use long-form query parameter names Synchronize query parameter names with web-gateway update: http://icedtea.classpath.org/pipermail/thermostat/2017-July/024240.html Reviewed-by: jerboaa Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2017-July/024272.html
author Andrew Azores <aazores@redhat.com>
date Fri, 21 Jul 2017 12:36:22 -0400
parents ed58ad9f9558
children 70dadb296f6b
files mock-api/endpoints/jvm-gc.endpoint.js mock-api/endpoints/jvm-memory.endpoint.js src/app/components/jvm-info/jvm-gc/jvm-gc.service.js src/app/components/jvm-info/jvm-gc/jvm-gc.service.spec.js src/app/components/jvm-info/jvm-memory/jvm-memory.service.js src/app/components/jvm-info/jvm-memory/jvm-memory.service.spec.js
diffstat 6 files changed, 18 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/mock-api/endpoints/jvm-gc.endpoint.js	Thu Jul 20 15:30:14 2017 -0400
+++ b/mock-api/endpoints/jvm-gc.endpoint.js	Fri Jul 21 12:36:22 2017 -0400
@@ -5,7 +5,7 @@
   server.app.get('/jvm-gc/0.0.2', function (req, res, next) {
     server.logRequest('jvm-gc', req);
 
-    var query = req.query.q;
+    var query = req.query.query;
     query = _.split(query, '&');
     var jvmId = 'foo-jvmId';
     for (var i = 0; i < query.length; i++) {
@@ -14,7 +14,7 @@
         jvmId = _.split(str, '==')[1];
       }
     }
-    var limit = req.query.l || 1;
+    var limit = req.query.limit || 1;
 
     var response = [];
     for (var i = 0; i < limit; i++) {
--- a/mock-api/endpoints/jvm-memory.endpoint.js	Thu Jul 20 15:30:14 2017 -0400
+++ b/mock-api/endpoints/jvm-memory.endpoint.js	Fri Jul 21 12:36:22 2017 -0400
@@ -4,7 +4,7 @@
   server.app.get('/jvm-memory/0.0.2', function (req, res, next) {
     server.logRequest('jvm-memory', req);
 
-    var query = req.query.q;
+    var query = req.query.query;
     query = _.split(query, '&');
     var jvmId = undefined;
     for (var i = 0; i < query.length; i++) {
--- a/src/app/components/jvm-info/jvm-gc/jvm-gc.service.js	Thu Jul 20 15:30:14 2017 -0400
+++ b/src/app/components/jvm-info/jvm-gc/jvm-gc.service.js	Fri Jul 21 12:36:22 2017 -0400
@@ -37,12 +37,12 @@
 
   getJvmGcData (jvmId, limit = 1, collectorName) {
     let params = {
-      l: limit,
-      s: '-timeStamp',
-      q: 'jvmId==' + jvmId
+      limit: limit,
+      sort: '-timeStamp',
+      query: 'jvmId==' + jvmId
     };
     if (collectorName) {
-      params.q += ',collectorName==' + collectorName;
+      params.query += ',collectorName==' + collectorName;
     }
     return this.http.get(urlJoin(this.gatewayUrl, 'jvm-gc', '0.0.2'), { params: params });
   }
--- a/src/app/components/jvm-info/jvm-gc/jvm-gc.service.spec.js	Thu Jul 20 15:30:14 2017 -0400
+++ b/src/app/components/jvm-info/jvm-gc/jvm-gc.service.spec.js	Fri Jul 21 12:36:22 2017 -0400
@@ -59,13 +59,13 @@
       let expected = {
         metaspace: 100
       };
-      httpBackend.when('GET', 'http://example.com:1234/jvm-gc/0.0.2?l=1&s=-timeStamp&q=jvmId%3D%3Dfoo-jvmId')
+      httpBackend.when('GET', 'http://example.com:1234/jvm-gc/0.0.2?limit=1&sort=-timeStamp&query=jvmId%3D%3Dfoo-jvmId')
         .respond(expected);
       svc.getJvmGcData('foo-jvmId').then(res => {
         res.data.should.deepEqual(expected);
         done();
       });
-      httpBackend.expectGET('http://example.com:1234/jvm-gc/0.0.2?l=1&s=-timeStamp&q=jvmId%3D%3Dfoo-jvmId');
+      httpBackend.expectGET('http://example.com:1234/jvm-gc/0.0.2?limit=1&sort=-timeStamp&query=jvmId%3D%3Dfoo-jvmId');
       httpBackend.flush();
       scope.$apply();
     });
@@ -74,13 +74,13 @@
       let expected = {
         metaspace: 100
       };
-      httpBackend.when('GET', 'http://example.com:1234/jvm-gc/0.0.2?l=5&s=-timeStamp&q=jvmId%3D%3Dfoo-jvmId')
+      httpBackend.when('GET', 'http://example.com:1234/jvm-gc/0.0.2?limit=5&sort=-timeStamp&query=jvmId%3D%3Dfoo-jvmId')
         .respond(expected);
       svc.getJvmGcData('foo-jvmId', 5).then(res => {
         res.data.should.deepEqual(expected);
         done();
       });
-      httpBackend.expectGET('http://example.com:1234/jvm-gc/0.0.2?l=5&s=-timeStamp&q=jvmId%3D%3Dfoo-jvmId');
+      httpBackend.expectGET('http://example.com:1234/jvm-gc/0.0.2?limit=5&sort=-timeStamp&query=jvmId%3D%3Dfoo-jvmId');
       httpBackend.flush();
       scope.$apply();
     });
@@ -89,13 +89,13 @@
       let expected = {
         metaspace: 100
       };
-      httpBackend.when('GET', 'http://example.com:1234/jvm-gc/0.0.2?l=5&q=jvmId%3D%3Dfoo-jvmId,collectorName%3D%3DfooCollector&s=-timeStamp')
+      httpBackend.when('GET', 'http://example.com:1234/jvm-gc/0.0.2?limit=5&query=jvmId%3D%3Dfoo-jvmId,collectorName%3D%3DfooCollector&sort=-timeStamp')
         .respond(expected);
       svc.getJvmGcData('foo-jvmId', 5, 'fooCollector').then(res => {
         res.data.should.deepEqual(expected);
         done();
       });
-      httpBackend.expectGET('http://example.com:1234/jvm-gc/0.0.2?l=5&q=jvmId%3D%3Dfoo-jvmId,collectorName%3D%3DfooCollector&s=-timeStamp');
+      httpBackend.expectGET('http://example.com:1234/jvm-gc/0.0.2?limit=5&query=jvmId%3D%3Dfoo-jvmId,collectorName%3D%3DfooCollector&sort=-timeStamp');
       httpBackend.flush();
       scope.$apply();
     });
--- a/src/app/components/jvm-info/jvm-memory/jvm-memory.service.js	Thu Jul 20 15:30:14 2017 -0400
+++ b/src/app/components/jvm-info/jvm-memory/jvm-memory.service.js	Fri Jul 21 12:36:22 2017 -0400
@@ -38,9 +38,9 @@
   getJvmMemory (jvmId) {
     return this.http.get(urlJoin(this.gatewayUrl, 'jvm-memory', '0.0.2'), {
       params: {
-        l: 1,
-        s: '-timeStamp',
-        q: 'jvmId==' + jvmId
+        limit: 1,
+        sort: '-timeStamp',
+        query: 'jvmId==' + jvmId
       }
     });
   }
--- a/src/app/components/jvm-info/jvm-memory/jvm-memory.service.spec.js	Thu Jul 20 15:30:14 2017 -0400
+++ b/src/app/components/jvm-info/jvm-memory/jvm-memory.service.spec.js	Fri Jul 21 12:36:22 2017 -0400
@@ -59,13 +59,13 @@
       let expected = {
         metaspace: 100
       };
-      httpBackend.when('GET', 'http://example.com:1234/jvm-memory/0.0.2?l=1&s=-timeStamp&q=jvmId%3D%3Dfoo-jvmId')
+      httpBackend.when('GET', 'http://example.com:1234/jvm-memory/0.0.2?limit=1&sort=-timeStamp&query=jvmId%3D%3Dfoo-jvmId')
         .respond(expected);
       svc.getJvmMemory('foo-jvmId').then(res => {
         res.data.should.deepEqual(expected);
         done();
       });
-      httpBackend.expectGET('http://example.com:1234/jvm-memory/0.0.2?l=1&s=-timeStamp&q=jvmId%3D%3Dfoo-jvmId');
+      httpBackend.expectGET('http://example.com:1234/jvm-memory/0.0.2?limit=1&sort=-timeStamp&query=jvmId%3D%3Dfoo-jvmId');
       httpBackend.flush();
       scope.$apply();
     });