Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B63FAFBDD for ; Sun, 2 Jun 2013 01:27:23 +0000 (UTC) Received: (qmail 40209 invoked by uid 500); 2 Jun 2013 01:25:18 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 35366 invoked by uid 500); 2 Jun 2013 01:25:01 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 1753 invoked by uid 99); 1 Jun 2013 21:23:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jun 2013 21:23:40 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 01 Jun 2013 21:23:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D8E192388980; Sat, 1 Jun 2013 21:23:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1488605 - in /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki: mgt/StatsServlet.java server/DatasetRef.java Date: Sat, 01 Jun 2013 21:23:19 -0000 To: commits@jena.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130601212319.D8E192388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andy Date: Sat Jun 1 21:23:19 2013 New Revision: 1488605 URL: http://svn.apache.org/r1488605 Log: JSON stats results. Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/StatsServlet.java jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/StatsServlet.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/StatsServlet.java?rev=1488605&r1=1488604&r2=1488605&view=diff ============================================================================== --- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/StatsServlet.java (original) +++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/StatsServlet.java Sat Jun 1 21:23:19 2013 @@ -82,13 +82,19 @@ public class StatsServlet extends HttpSe stats.put(CounterName.RequestsGood.name(), desc.counters.value(CounterName.RequestsGood)) ; stats.put(CounterName.RequestsBad.name(), desc.counters.value(CounterName.RequestsBad)) ; JsonObject services = new JsonObject() ; + +// JsonArray endpoints = new JsonArray() ; +// services.put("endpoints", endpoints) ; +// JsonArray srvNames = new JsonArray() ; +// services.put("names", srvNames) ; + // There can be several endpoints for one service. for ( ServiceRef srvRef : desc.getServiceRefs() ) { JsonObject epStats = new JsonObject() ; statsJSON(epStats, srvRef) ; services.put(srvRef.name, epStats) ; JsonArray endpoints = new JsonArray() ; - services.put("endpoints", endpoints) ; + epStats.put("endpoints", endpoints) ; for ( String ep : srvRef.endpoints) { endpoints.add(ep) ; } Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java?rev=1488605&r1=1488604&r2=1488605&view=diff ============================================================================== --- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java (original) +++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java Sat Jun 1 21:23:19 2013 @@ -31,23 +31,18 @@ public class DatasetRef implements Datas public String name = null ; public DatasetGraph dataset = null ; - private List serviceRefs = new ArrayList() ; - private ServiceRef createService(String name) { - ServiceRef sr = new ServiceRef(name) ; - serviceRefs.add(sr) ; - return sr ; - } - public ServiceRef query = createService("query") ; - public ServiceRef update = createService("update") ; - public ServiceRef upload = createService("upload") ; - public ServiceRef readGraphStore = createService("gspRead") ; - public ServiceRef readWriteGraphStore = createService("gspReadWrite") ; + public ServiceRef query = new ServiceRef("query") ; + public ServiceRef update = new ServiceRef("update") ; + public ServiceRef upload = new ServiceRef("upload") ; + public ServiceRef readGraphStore = new ServiceRef("gspRead") ; + public ServiceRef readWriteGraphStore = new ServiceRef("gspReadWrite") ; // Dataset-level counters. public final CounterSet counters = new CounterSet() ; private Map endpoints = new HashMap() ; + private List serviceRefs = new ArrayList() ; private boolean initialized = false ; // Two step initiation (c.f. Builder pattern) @@ -61,17 +56,17 @@ public class DatasetRef implements Datas } private void initServices() { - add(endpoints, query) ; - add(endpoints, update) ; - add(endpoints, upload) ; - add(endpoints, readGraphStore) ; - add(endpoints, readWriteGraphStore) ; + add(query) ; + add(update) ; + add(upload) ; + add(readGraphStore) ; + add(readWriteGraphStore) ; } - private static void add(Map serviceRefs, ServiceRef srvRef) - { + private void add(ServiceRef srvRef) { + serviceRefs.add(srvRef) ; for ( String ep : srvRef.endpoints ) - serviceRefs.put(ep, srvRef) ; + endpoints.put(ep, srvRef) ; } public ServiceRef getServiceRef(String service) { @@ -82,10 +77,6 @@ public class DatasetRef implements Datas return endpoints.get(service) ; } - public Collection ZgetEndpoints() { - return endpoints.keySet() ; - } - public Collection getServiceRefs() { return serviceRefs ; }