You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/02/08 19:49:51 UTC
svn commit: r1566094 - in /jena/branches/jena-fuseki-new-ui/src:
main/java/org/apache/jena/fuseki/async/
main/java/org/apache/jena/fuseki/build/ main/java/org/apache/jena/fuseki/mgt/
main/java/org/apache/jena/fuseki/server/ main/java/org/apache/jena/fu...
Author: andy
Date: Sat Feb 8 18:49:50 2014
New Revision: 1566094
URL: http://svn.apache.org/r1566094
Log:
Clean up (Java7)
Modified:
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/CounterSet.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DataService.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerInitialConfig.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/async/AsyncPool.java Sat Feb 8 18:49:50 2014
@@ -38,7 +38,7 @@ public class AsyncPool
new LinkedBlockingQueue<Runnable>()) ;
private final Object mutex = new Object() ;
- private List<AsyncTask> running = new ArrayList<AsyncTask>() ;
+ private List<AsyncTask> running = new ArrayList<>() ;
private AsyncPool() { }
@@ -52,7 +52,7 @@ public class AsyncPool
public Collection<AsyncTask> task() {
synchronized(mutex) {
- return new ArrayList<AsyncTask>(running) ;
+ return new ArrayList<>(running) ;
}
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/DataServiceDesc.java Sat Feb 8 18:49:50 2014
@@ -39,7 +39,7 @@ import com.hp.hpl.jena.sparql.util.graph
public abstract class DataServiceDesc
{
public static DataServiceDesc createFromTemplate(String templateFile, String dbName) {
- Map<String, String> params = new HashMap<String, String>() ;
+ Map<String, String> params = new HashMap<>() ;
params.put(Template.NAME, dbName) ;
String template = TemplateFunctions.template(templateFile, params) ;
Lang lang = RDFLanguages.filenameToLang(templateFile, Lang.TTL) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/build/FusekiConfig.java Sat Feb 8 18:49:50 2014
@@ -127,7 +127,7 @@ public class FusekiConfig {
if ( !rs.hasNext() )
log.warn("No services found") ;
- List<DataAccessPoint> accessPoints = new ArrayList<DataAccessPoint>() ;
+ List<DataAccessPoint> accessPoints = new ArrayList<>() ;
for ( ; rs.hasNext() ; ) {
QuerySolution soln = rs.next() ;
@@ -186,7 +186,7 @@ public class FusekiConfig {
// ---- Directory of assemblers
public static List<DataAccessPoint> readConfigurationDirectory(String dir) {
- List<DataAccessPoint> dataServiceRef = new ArrayList<DataAccessPoint>() ;
+ List<DataAccessPoint> dataServiceRef = new ArrayList<>() ;
File d = new File(dir) ;
String[] aFiles = d.list(visibleFiles) ;
if ( aFiles == null ) {
@@ -236,7 +236,7 @@ public class FusekiConfig {
"}"
) ;
- List<DataAccessPoint> refs = new ArrayList<DataAccessPoint>() ;
+ List<DataAccessPoint> refs = new ArrayList<>() ;
ResultSet rs = FusekiLib.query(qs, ds) ;
@@ -258,234 +258,4 @@ public class FusekiConfig {
}
return refs ;
}
-
- // static {
-// Fuseki.init() ;
-// }
-//
-// private static Logger log = Fuseki.configLog ;
-//
-// private static FilenameFilter visibleFiles =
-// new FilenameFilter() {
-// @Override
-// public boolean accept(File dir, String name) {
-// if ( name.startsWith(".") )
-// return false ;
-// File f = new File(dir, name) ;
-// return f.isFile() ;
-// }
-// }
-// ;
-//
-// // ---- DatasetRef used where there isn't a real Dataset e.g. the SPARQL processor.
-//
-// /**
-// * Return the DataService (read-only) for when there is no dataset, just a
-// * SPARQL Query processor
-// */
-// public static DataService serviceOnlyDatasetRef() {
-// return DataService.dummy ;
-// }
-//
-// /** Setup the server configuration based on ServerInitialConfig (from command line) */
-// public static List<DataAccessPoint> defaultConfiguration(ServerInitialConfig params) {
-// if ( params.fusekiConfigFile != null )
-// log.warn("Configuration file found while processing command line dataset configuration") ;
-//
-// // Use a template assembler.
-//
-// DataService dbSvc = DataService.create(params.dsg) ;
-// DataAccessPoint dataAccess = new DataAccessPoint(params.datasetPath) ;
-// dataAccess.setDataService(dbSvc);
-// dbSvc.addEndpoint(OperationName.Query, DEF.ServiceQuery);
-// dbSvc.addEndpoint(OperationName.Query, DEF.ServiceQueryAlt) ;
-//
-// if ( params.allowUpdate ) {
-// dbSvc.addEndpoint(OperationName.Update, DEF.ServiceUpdate) ;
-// dbSvc.addEndpoint(OperationName.Upload, DEF.ServiceUpload) ;
-// dbSvc.addEndpoint(OperationName.GSP, DEF.ServiceData) ;
-// } else
-// dbSvc.addEndpoint(OperationName.GSP_R, DEF.ServiceData) ;
-//
-// return Arrays.asList(dataAccess) ;
-// }
-//
-//// /** Read one of more dataset descriptions in a model */
-//// public static List<DatasetRef> readConfiguration(Model m) {
-//// additionalRDF(m) ;
-//// List<Resource> services = getByType(FusekiVocab.fusekiService, m) ;
-////
-//// if ( services.size() == 0 ) {
-//// log.error("No services found") ;
-//// throw new FusekiConfigException() ;
-//// }
-////
-//// // Remove?
-//// if ( services.size() > 1 ) {
-//// log.error("Multiple services found") ;
-//// throw new FusekiConfigException() ;
-//// }
-////
-//// List<DatasetRef> refs = new ArrayList<DatasetRef>() ;
-////
-//// Resource service = services.get(0) ;
-//// String name = ((Literal)getOne(service, "fuseki:name")).getLexicalForm() ;
-//// log.info("name = "+name);
-//// DatasetRef dsDesc = processService(service) ;
-//// String datasetPath = dsDesc.name ;
-//// refs.add(dsDesc) ;
-//// return refs ;
-//// }
-//
-
-//
-//
-//
-//
-// // ---- Old style config file processing
-//
-// private static void server(Model model) {
-// // Find one server.
-// List<Resource> servers = getByType(FusekiVocab.tServer, model) ;
-// if ( servers.size() == 0 )
-// throw new FusekiConfigException("No server found (no resource with type "
-// + FusekiLib.strForResource(FusekiVocab.tServer)) ;
-// if ( servers.size() > 1 )
-// throw new FusekiConfigException(servers.size()
-// + " servers found (must be exactly one in a configuration file)") ;
-//
-// // ---- Server
-// Resource server = servers.get(0) ;
-// processServer(server) ;
-// }
-//
-// private static List<DataAccessPoint> servicesAndDatasets(Model model) {
-// // Old style configuration file : server to services.
-// // ---- Services
-// ResultSet rs = FusekiLib.query("SELECT * { ?s fu:services [ list:member ?member ] }", model) ;
-// if ( !rs.hasNext() )
-// log.warn("No services found") ;
-//
-// List<DataAccessPoint> accessPoints = new ArrayList<DataAccessPoint>() ;
-//
-// for ( ; rs.hasNext() ; ) {
-// QuerySolution soln = rs.next() ;
-// Resource svc = soln.getResource("member") ;
-// DataAccessPoint acc = DataAccessPointAssembler.processService(svc) ;
-// accessPoints.add(acc) ;
-// }
-// return accessPoints ;
-// }
-//
-// private static void processServer(Resource server) {
-// // Global, currently.
-// AssemblerUtils.setContext(server, Fuseki.getContext()) ;
-//
-// StmtIterator sIter = server.listProperties(JA.loadClass) ;
-// for ( ; sIter.hasNext() ; ) {
-// Statement s = sIter.nextStatement() ;
-// RDFNode rn = s.getObject() ;
-// String className = null ;
-// if ( rn instanceof Resource ) {
-// String uri = ((Resource)rn).getURI() ;
-// if ( uri == null ) {
-// log.warn("Blank node for class to load") ;
-// continue ;
-// }
-// String javaScheme = "java:" ;
-// if ( !uri.startsWith(javaScheme) ) {
-// log.warn("Class to load is not 'java:': " + uri) ;
-// continue ;
-// }
-// className = uri.substring(javaScheme.length()) ;
-// }
-// if ( rn instanceof Literal )
-// className = ((Literal)rn).getLexicalForm() ;
-// /* Loader. */loadAndInit(className) ;
-// }
-// }
-//
-//
-// // ---- DatasetRef used where there isn't a real Dataset e.g. the SPARQL processor.
-//
-// private static void loadAndInit(String className) {
-// try {
-// Class<? > classObj = Class.forName(className) ;
-// log.info("Loaded " + className) ;
-// Method initMethod = classObj.getMethod("init") ;
-// initMethod.invoke(null) ;
-// }
-// catch (ClassNotFoundException ex) {
-// log.warn("Class not found: " + className) ;
-// }
-// catch (Exception e) {
-// throw new FusekiConfigException(e) ;
-// }
-// }
-//
-//// /** Build a DatasetRef from an assember starting at Resource svc */
-//// public static DataAccessPoint processService(Resource svc) {
-//// // XXX DataServiceAssembler
-//// // XXX DataAccessPoint
-//// log.info("Service: " + FusekiLib.nodeLabel(svc)) ;
-////
-//// String name = ((Literal)getOne(svc, "fu:name")).getLexicalForm() ;
-////
-//// Resource datasetDesc = ((Resource)getOne(svc, "fu:dataset")) ;
-//// // Check if it is in the model.
-//// if ( !datasetDesc.hasProperty(RDF.type) )
-//// throw new FusekiConfigException("No rdf:type for dataset " + FusekiLib.nodeLabel(datasetDesc)) ;
-//// Dataset ds = (Dataset)Assembler.general.open(datasetDesc) ;
-//// // Assembler to do all this.
-//// DataService dataService = new DataService(svc, ds.asDatasetGraph()) ;
-////
-//// DataAccessPoint dataAccess = new DataAccessPoint(name) ;
-//// dataAccess.setDataService(dataService) ;
-//// DatasetRegistry.get().put(name, dataAccess) ;
-////
-//// log.info(" name = " + dataAccess.getName()) ;
-////
-//// addServiceEP(dataAccess, dataService, OperationName.Query, svc, "fu:serviceQuery") ;
-//// addServiceEP(dataAccess, dataService, OperationName.Update, svc, "fu:serviceUpdate") ;
-//// addServiceEP(dataAccess, dataService, OperationName.Upload, svc, "fu:serviceUpload") ;
-//// addServiceEP(dataAccess, dataService, OperationName.GSP_R, svc, "fu:serviceReadGraphStore") ;
-//// addServiceEP(dataAccess, dataService, OperationName.GSP, svc, "fu:serviceReadWriteGraphStore") ;
-//// // XXX
-////// // Extract timeout overriding configuration if present.
-////// if ( svc.hasProperty(FusekiVocab.pAllowTimeoutOverride) ) {
-////// sDesc.allowTimeoutOverride = svc.getProperty(FusekiVocab.pAllowTimeoutOverride).getObject().asLiteral().getBoolean() ;
-////// if ( svc.hasProperty(FusekiVocab.pMaximumTimeoutOverride) ) {
-////// sDesc.maximumTimeoutOverride = (int)(svc.getProperty(FusekiVocab.pMaximumTimeoutOverride).getObject().asLiteral().getFloat() * 1000) ;
-////// }
-////// }
-////
-//// return dataAccess ;
-//// }
-//
-//
-// /** Initial configuration - for all the datasets, call the per dataset initization */
-// public static void configureDatasets(List<DataAccessPoint> datasets) {
-// for (DataAccessPoint dsDesc : datasets)
-// configureOneDataset(dsDesc) ;
-// }
-//
-// public static void configureOneDataset(DataAccessPoint dsDesc) {
-// registerDataset(dsDesc.getName(), dsDesc) ;
-// //addJMX(dsDesc) ;
-// }
-//
-// /** Register a DatasetRef, which should no already be registered */
-//
-// public static void registerDataset(String datasetPath, DataAccessPoint dataAccess) {
-// if ( DatasetRegistry.get().isRegistered(datasetPath) )
-// throw new FusekiConfigException("Already registered: key = "+datasetPath) ;
-// DatasetRegistry.get().put(datasetPath, dataAccess) ;
-// serverLog.info(format("Register dataset path = %s", datasetPath)) ;
-// //addJMX(dsDesc) ;
-// }
-//
-// public static List<Resource> getByType(Resource type, Model m) {
-// ResIterator rIter = m.listSubjectsWithProperty(RDF.type, type) ;
-// return Iter.toList(rIter) ;
-// }
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java Sat Feb 8 18:49:50 2014
@@ -19,10 +19,9 @@
package org.apache.jena.fuseki.mgt;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.build.FusekiConfig ;
import org.apache.jena.fuseki.server.DataAccessPoint ;
-import org.apache.jena.fuseki.server.DataService ;
import org.apache.jena.fuseki.server.DataAccessPointRegistry ;
+import org.apache.jena.fuseki.server.DataService ;
import org.apache.jena.fuseki.servlets.ActionBase ;
import org.apache.jena.fuseki.servlets.HttpAction ;
import org.apache.jena.fuseki.servlets.ServletOps ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java Sat Feb 8 18:49:50 2014
@@ -294,7 +294,7 @@ public class ActionDatasets extends Acti
private void assemblerFromForm(HttpAction action, StreamRDF dest) {
String dbType = action.getRequest().getParameter(paramDatasetType) ;
String dbName = action.getRequest().getParameter(paramDatasetName) ;
- Map<String, String> params = new HashMap<String, String>() ;
+ Map<String, String> params = new HashMap<>() ;
params.put(Template.NAME, dbName) ;
action.log.info(format("[%d] Create database : name = %s, type = %s", action.id, dbName, dbType )) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java Sat Feb 8 18:49:50 2014
@@ -27,8 +27,6 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import com.hp.hpl.jena.sparql.util.Utils ;
-
import org.apache.jena.atlas.json.JSON ;
import org.apache.jena.atlas.json.JsonBuilder ;
import org.apache.jena.atlas.json.JsonValue ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/CounterSet.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/CounterSet.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/CounterSet.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/CounterSet.java Sat Feb 8 18:49:50 2014
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory ;
public class CounterSet {
private static Logger log = LoggerFactory.getLogger(CounterSet.class) ;
- private Map<CounterName, Counter> counters = new HashMap<CounterName, Counter>() ;
+ private Map<CounterName, Counter> counters = new HashMap<>() ;
public CounterSet() {}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DataService.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DataService.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DataService.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/DataService.java Sat Feb 8 18:49:50 2014
@@ -59,7 +59,7 @@ public class DataService { //implements
private DatasetGraph dataset = null ; // Only valid if active.
private MultiMapToList<OperationName, Endpoint> operations = MultiMap.createMapList() ;
- private Map<String, Endpoint> endpoints = new HashMap<String, Endpoint>() ;
+ private Map<String, Endpoint> endpoints = new HashMap<>() ;
private volatile DatasetStatus state = UNINITIALIZED ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java Sat Feb 8 18:49:50 2014
@@ -100,7 +100,7 @@ public class FusekiServer
// DRY -- ActionDatasets (and others?)
if ( params == null ) {
- params = new HashMap<String, String>() ;
+ params = new HashMap<>() ;
params.put(Template.NAME, datasetPath) ;
} else {
if ( ! params.containsKey(Template.NAME) ) {
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiServletContextListener.java Sat Feb 8 18:49:50 2014
@@ -18,17 +18,11 @@
package org.apache.jena.fuseki.server;
-import java.util.ArrayList ;
-import java.util.List ;
-
import javax.servlet.ServletContext ;
import javax.servlet.ServletContextEvent ;
import javax.servlet.ServletContextListener ;
-import org.apache.jena.atlas.lib.DS ;
-import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.fuseki.Fuseki ;
-import org.apache.jena.fuseki.build.FusekiConfig ;
import org.slf4j.Logger ;
public class FusekiServletContextListener implements ServletContextListener {
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerInitialConfig.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerInitialConfig.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerInitialConfig.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerInitialConfig.java Sat Feb 8 18:49:50 2014
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.sparql.core.Datas
public class ServerInitialConfig {
// Either this ...
public String templateFile = null ;
- public Map<String,String> params = new HashMap<String,String>() ;
+ public Map<String,String> params = new HashMap<>() ;
public String datasetPath = null ;
public boolean allowUpdate = false ;
// Or this ...
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ActionSPARQL.java Sat Feb 8 18:49:50 2014
@@ -107,11 +107,7 @@ public abstract class ActionSPARQL exten
// Success
incCounter(csOperation, RequestsGood) ;
incCounter(csService, RequestsGood) ;
- } catch (ActionErrorException /*JAVA7 | QueryCancelledException*/ ex) {
- incCounter(csOperation, RequestsBad) ;
- incCounter(csService, RequestsBad) ;
- throw ex ;
- } catch (QueryCancelledException ex) {
+ } catch (ActionErrorException | QueryCancelledException ex) {
incCounter(csOperation, RequestsBad) ;
incCounter(csService, RequestsBad) ;
throw ex ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java Sat Feb 8 18:49:50 2014
@@ -84,7 +84,7 @@ public class HttpAction
String contentType = null ;
// Cleared to archive:
- Map <String, String> headers = new HashMap<String, String>() ;
+ Map <String, String> headers = new HashMap<>() ;
public HttpServletRequest request;
public HttpServletResponseTracker response ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java Sat Feb 8 18:49:50 2014
@@ -47,7 +47,7 @@ public class ResponseModel
private static final String contentOutputTTL = "ttl" ;
private static final String contentOutputNT = "nt" ;
- public static Map<String,String> shortNamesModel = new HashMap<String, String>() ;
+ public static Map<String,String> shortNamesModel = new HashMap<>() ;
static {
// Some short names. keys are lowercase.
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Sat Feb 8 18:49:50 2014
@@ -58,7 +58,7 @@ public class ResponseResultSet
private static final String contentOutputCSV = "csv" ;
private static final String contentOutputTSV = "tsv" ;
- public static Map<String,String> shortNamesResultSet = new HashMap<String, String>() ;
+ public static Map<String,String> shortNamesResultSet = new HashMap<>() ;
static {
// Some short names. keys are lowercase.
ResponseOps.put(shortNamesResultSet, contentOutputJSON, contentTypeResultsJSON) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/IRIValidator.java Sat Feb 8 18:49:50 2014
@@ -62,8 +62,8 @@ public class IRIValidator extends Valida
IRI iri = iriFactory.create(iriStr) ;
- List<String> errors = new ArrayList<String>() ;
- List<String> warnings = new ArrayList<String>() ;
+ List<String> errors = new ArrayList<>() ;
+ List<String> warnings = new ArrayList<>() ;
if ( iri.isRelative() )
warnings.add("Relative IRI: "+iriStr) ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/validation/ValidationAction.java Sat Feb 8 18:49:50 2014
@@ -44,7 +44,7 @@ public class ValidationAction
int contentLength = -1 ;
String contentType = null ;
- Map <String, String> headers = new HashMap<String, String>() ;
+ Map <String, String> headers = new HashMap<>() ;
public HttpServletRequest request;
public HttpServletResponse response ;
Modified: jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/ServerTest.java Sat Feb 8 18:49:50 2014
@@ -112,7 +112,8 @@ public class ServerTest {
ServerConfig config = make(true, true) ;
config.authConfigFile = authConfigFile ;
- server = new SPARQLServer(config) ;
+ SPARQLServer.initializeServer(config);
+ server = SPARQLServer.instance ;
server.start() ;
}
Modified: jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java?rev=1566094&r1=1566093&r2=1566094&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/http/TestHttpOp.java Sat Feb 8 18:49:50 2014
@@ -18,8 +18,6 @@
package org.apache.jena.fuseki.http;
-import java.io.IOException ;
-
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.atlas.web.HttpException ;
@@ -34,7 +32,6 @@ import org.junit.BeforeClass ;
import org.junit.Test ;
import com.hp.hpl.jena.sparql.engine.http.Params ;
-import com.hp.hpl.jena.util.FileUtils ;
// This a mixture of testing HttpOp and testing basic operation of the SPARQL server
// especially error cases abnd unusual usage that the higher level APIs don't use.