From f6f12efe6d75fa5ded983e3c780c41d5b371d644 Mon Sep 17 00:00:00 2001 From: Jim Blake Date: Fri, 31 Oct 2014 18:20:18 -0400 Subject: [PATCH] Repair logging queries from the developer panel. the DataStructuresProviders must wrap their RDFServiceFactory in LoggingRDFServiceFactory, and insure that their RDFService comes from that wrapped factory. --- .../rdfservice/impl/logging/LoggingRDFService.java | 5 +++++ .../impl/logging/LoggingRDFServiceFactory.java | 5 +++++ .../impl/sdb/ContentDataStructuresProviderSDB.java | 4 +++- .../sparql/ContentDataStructuresProviderSPARQL.java | 10 ++++++---- .../tdb/ConfigurationDataStructuresProviderTDB.java | 11 +++++++---- .../impl/tdb/ContentDataStructuresProviderTDB.java | 4 +++- 6 files changed, 29 insertions(+), 10 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java index 9d98722ec..99d50b095 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java @@ -126,4 +126,9 @@ public class LoggingRDFService implements RDFService { public void close() { innerService.close(); } + + @Override + public String toString() { + return "LoggingRDFService[inner=" + innerService + "]"; + } } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java index 894b208d1..fec57486d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java @@ -40,4 +40,9 @@ public class LoggingRDFServiceFactory implements RDFServiceFactory { factory.unregisterListener(changeListener); } + @Override + public String toString() { + return "LoggingRDFServiceFactory[factory=" + factory + "]"; + } + } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sdb/ContentDataStructuresProviderSDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sdb/ContentDataStructuresProviderSDB.java index ba6d249de..2bd411900 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sdb/ContentDataStructuresProviderSDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sdb/ContentDataStructuresProviderSDB.java @@ -39,6 +39,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ontmodels.UnionModelsOntMode import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.sdb.RDFServiceFactorySDB; +import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.logging.LoggingRDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.servlet.setup.JenaDataSourceSetupBase; import edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.impl.ContentDataStructuresProvider; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; @@ -122,7 +123,8 @@ public class ContentDataStructuresProviderSDB extends setupSDB(store); } - return new RDFServiceFactorySDB(ds, storeDesc); + return new LoggingRDFServiceFactory(new RDFServiceFactorySDB(ds, + storeDesc)); } /** diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sparql/ContentDataStructuresProviderSPARQL.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sparql/ContentDataStructuresProviderSPARQL.java index 9b43cbcbe..a0917dae6 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sparql/ContentDataStructuresProviderSPARQL.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sparql/ContentDataStructuresProviderSPARQL.java @@ -17,6 +17,7 @@ import edu.cornell.mannlib.vitro.webapp.modelaccess.ontmodels.OntModelCache; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; +import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.logging.LoggingRDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.sparql.RDFServiceSparql; import edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.impl.ContentDataStructuresProvider; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; @@ -58,8 +59,8 @@ public class ContentDataStructuresProviderSPARQL extends this.updateEndpointURI = props .getProperty(PROPERTY_SPARQL_UPDATE_ENDPOINT_URI); - this.rdfService = createRDFService(); - this.rdfServiceFactory = createRDFServiceFactory(); + this.rdfServiceFactory = createRDFServiceFactory(createRDFService()); + this.rdfService = this.rdfServiceFactory.getRDFService(); this.dataset = createDataset(); this.modelMaker = createModelMaker(); } @@ -75,8 +76,9 @@ public class ContentDataStructuresProviderSPARQL extends } } - private RDFServiceFactory createRDFServiceFactory() { - return new RDFServiceFactorySingle(this.rdfService); + private RDFServiceFactory createRDFServiceFactory(RDFService service) { + return new LoggingRDFServiceFactory( + new RDFServiceFactorySingle(service)); } private Dataset createDataset() { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ConfigurationDataStructuresProviderTDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ConfigurationDataStructuresProviderTDB.java index 003cdb1f6..e65363904 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ConfigurationDataStructuresProviderTDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ConfigurationDataStructuresProviderTDB.java @@ -22,6 +22,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.tdb.RDFServiceTDB; +import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.logging.LoggingRDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.impl.ConfigurationDataStructuresProvider; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -60,8 +61,8 @@ public class ConfigurationDataStructuresProviderTDB extends + DIRECTORY_TDB; try { - this.rdfService = new RDFServiceTDB(tdbPath); - this.rdfServiceFactory = createRDFServiceFactory(); + this.rdfServiceFactory = createRDFServiceFactory(tdbPath); + this.rdfService = this.rdfServiceFactory.getRDFService(); this.dataset = new RDFServiceDataset(this.rdfService); this.modelMaker = createModelMaker(); ss.info(ctxListener, "Initialized the RDF source for TDB"); @@ -75,8 +76,10 @@ public class ConfigurationDataStructuresProviderTDB extends TDB.getContext().setTrue(TDB.symUnionDefaultGraph); } - private RDFServiceFactory createRDFServiceFactory() { - return new RDFServiceFactorySingle(this.rdfService); + private RDFServiceFactory createRDFServiceFactory(String tdbPath) + throws IOException { + return new LoggingRDFServiceFactory(new RDFServiceFactorySingle( + new RDFServiceTDB(tdbPath))); } private ModelMaker createModelMaker() { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ContentDataStructuresProviderTDB.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ContentDataStructuresProviderTDB.java index 641f2d02c..bcd95680f 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ContentDataStructuresProviderTDB.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ContentDataStructuresProviderTDB.java @@ -21,6 +21,7 @@ import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFService; import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.jena.tdb.RDFServiceTDB; +import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.logging.LoggingRDFServiceFactory; import edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.impl.ContentDataStructuresProvider; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; @@ -74,7 +75,8 @@ public class ContentDataStructuresProviderTDB extends } private RDFServiceFactory createRDFServiceFactory() { - return new RDFServiceFactorySingle(this.rdfService); + return new LoggingRDFServiceFactory(new RDFServiceFactorySingle( + this.rdfService)); } private ModelMaker createModelMaker() {