litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Repair logging queries from the developer panel.

Browse source 
the DataStructuresProviders must wrap their RDFServiceFactory in LoggingRDFServiceFactory,
and insure that their RDFService comes from that wrapped factory.
This commit is contained in:
Jim Blake 2014-10-31 18:20:18 -04:00
parent c7ace22406
commit f6f12efe6d
6 changed files with 29 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFService.java
View file

@ -126,4 +126,9 @@ public class LoggingRDFService implements RDFService {
public void close() { public void close() {
innerService.close(); innerService.close();
} }
@Override
public String toString() {
return "LoggingRDFService[inner=" + innerService + "]";
}
} }

5
webapp/src/edu/cornell/mannlib/vitro/webapp/rdfservice/impl/logging/LoggingRDFServiceFactory.java
View file

@ -40,4 +40,9 @@ public class LoggingRDFServiceFactory implements RDFServiceFactory {
factory.unregisterListener(changeListener); factory.unregisterListener(changeListener);
} }
@Override
public String toString() {
return "LoggingRDFServiceFactory[factory=" + factory + "]";
}
} }

4
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sdb/ContentDataStructuresProviderSDB.java
View file

@ -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.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; 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.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.JenaDataSourceSetupBase;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.impl.ContentDataStructuresProvider; 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.startup.StartupStatus;
@ -122,7 +123,8 @@ public class ContentDataStructuresProviderSDB extends
setupSDB(store); setupSDB(store);
} }
return new RDFServiceFactorySDB(ds, storeDesc); return new LoggingRDFServiceFactory(new RDFServiceFactorySDB(ds,
storeDesc));
} }
/** /**

10
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/sparql/ContentDataStructuresProviderSPARQL.java
View file

@ -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.RDFService;
import edu.cornell.mannlib.vitro.webapp.rdfservice.RDFServiceFactory; 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.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.rdfservice.impl.sparql.RDFServiceSparql;
import edu.cornell.mannlib.vitro.webapp.servlet.setup.rdfsetup.impl.ContentDataStructuresProvider; 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.startup.StartupStatus;
@ -58,8 +59,8 @@ public class ContentDataStructuresProviderSPARQL extends
this.updateEndpointURI = props this.updateEndpointURI = props
.getProperty(PROPERTY_SPARQL_UPDATE_ENDPOINT_URI); .getProperty(PROPERTY_SPARQL_UPDATE_ENDPOINT_URI);
this.rdfService = createRDFService(); this.rdfServiceFactory = createRDFServiceFactory(createRDFService());
this.rdfServiceFactory = createRDFServiceFactory(); this.rdfService = this.rdfServiceFactory.getRDFService();
this.dataset = createDataset(); this.dataset = createDataset();
this.modelMaker = createModelMaker(); this.modelMaker = createModelMaker();
} }
@ -75,8 +76,9 @@ public class ContentDataStructuresProviderSPARQL extends
} }
} }
private RDFServiceFactory createRDFServiceFactory() { private RDFServiceFactory createRDFServiceFactory(RDFService service) {
return new RDFServiceFactorySingle(this.rdfService); return new LoggingRDFServiceFactory(
new RDFServiceFactorySingle(service));
} }
private Dataset createDataset() { private Dataset createDataset() {

11
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ConfigurationDataStructuresProviderTDB.java
View file

@ -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.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; 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.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.servlet.setup.rdfsetup.impl.ConfigurationDataStructuresProvider;
import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
@ -60,8 +61,8 @@ public class ConfigurationDataStructuresProviderTDB extends
+ DIRECTORY_TDB; + DIRECTORY_TDB;
try { try {
this.rdfService = new RDFServiceTDB(tdbPath); this.rdfServiceFactory = createRDFServiceFactory(tdbPath);
this.rdfServiceFactory = createRDFServiceFactory(); this.rdfService = this.rdfServiceFactory.getRDFService();
this.dataset = new RDFServiceDataset(this.rdfService); this.dataset = new RDFServiceDataset(this.rdfService);
this.modelMaker = createModelMaker(); this.modelMaker = createModelMaker();
ss.info(ctxListener, "Initialized the RDF source for TDB"); ss.info(ctxListener, "Initialized the RDF source for TDB");
@ -75,8 +76,10 @@ public class ConfigurationDataStructuresProviderTDB extends
TDB.getContext().setTrue(TDB.symUnionDefaultGraph); TDB.getContext().setTrue(TDB.symUnionDefaultGraph);
} }
private RDFServiceFactory createRDFServiceFactory() { private RDFServiceFactory createRDFServiceFactory(String tdbPath)
return new RDFServiceFactorySingle(this.rdfService); throws IOException {
return new LoggingRDFServiceFactory(new RDFServiceFactorySingle(
new RDFServiceTDB(tdbPath)));
} }
private ModelMaker createModelMaker() { private ModelMaker createModelMaker() {

4
webapp/src/edu/cornell/mannlib/vitro/webapp/servlet/setup/rdfsetup/impl/tdb/ContentDataStructuresProviderTDB.java
View file

@ -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.RDFServiceFactory;
import edu.cornell.mannlib.vitro.webapp.rdfservice.impl.RDFServiceFactorySingle; 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.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.servlet.setup.rdfsetup.impl.ContentDataStructuresProvider;
import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus; import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString; import edu.cornell.mannlib.vitro.webapp.utils.logging.ToString;
@ -74,7 +75,8 @@ public class ContentDataStructuresProviderTDB extends
} }
private RDFServiceFactory createRDFServiceFactory() { private RDFServiceFactory createRDFServiceFactory() {
return new RDFServiceFactorySingle(this.rdfService); return new LoggingRDFServiceFactory(new RDFServiceFactorySingle(
this.rdfService));
} }
private ModelMaker createModelMaker() { private ModelMaker createModelMaker() {