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/06/24 11:07:06 UTC
svn commit: r1605034 [2/16] - in /jena/trunk: jena-arq/src/main/java/arq/
jena-arq/src/main/java/arq/cmdline/
jena-arq/src/main/java/com/hp/hpl/jena/query/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/
jena-arq/src/main/java/com/hp/hpl/jena/sparql/alg...
Modified: jena/trunk/jena-arq/src/main/java/arq/load.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/load.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/load.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/load.java Tue Jun 24 09:06:50 2014
@@ -80,11 +80,10 @@ public class load extends CmdUpdate
throw new CmdException("Nothing to do") ;
UpdateRequest req = new UpdateRequest() ;
- for ( Iterator<String> iter = loadFiles.iterator() ; iter.hasNext() ; )
+ for ( String filename : loadFiles )
{
- String filename = iter.next();
- UpdateLoad loadReq = new UpdateLoad(filename, graphName) ;
- req.add(loadReq) ;
+ UpdateLoad loadReq = new UpdateLoad( filename, graphName );
+ req.add( loadReq );
}
if ( true )
Modified: jena/trunk/jena-arq/src/main/java/arq/qexpr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/qexpr.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/qexpr.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/qexpr.java Tue Jun 24 09:06:50 2014
@@ -18,8 +18,6 @@
package arq;
-import java.util.Iterator ;
-
import org.apache.jena.atlas.io.IndentedWriter ;
import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.riot.out.NodeFmtLib ;
@@ -140,17 +138,21 @@ public class qexpr
boolean actionPrintPrefix = false ;
boolean actionPrintSPARQL = false ;
boolean actionPrint = cl.contains(printDecl) ;
-
- for ( Iterator<String> iter = cl.getValues(printDecl).iterator() ; iter.hasNext(); )
+
+ for ( String v : cl.getValues( printDecl ) )
{
- String v = iter.next();
- if ( v.equalsIgnoreCase("prefix") || v.equalsIgnoreCase("op") )
- actionPrintPrefix = true ;
- else if ( v.equalsIgnoreCase("expr") ) actionPrintSPARQL = true ;
+ if ( v.equalsIgnoreCase( "prefix" ) || v.equalsIgnoreCase( "op" ) )
+ {
+ actionPrintPrefix = true;
+ }
+ else if ( v.equalsIgnoreCase( "expr" ) )
+ {
+ actionPrintSPARQL = true;
+ }
else
{
- System.err.println("Unknown print form: "+v) ;
- throw new TerminationException(0) ;
+ System.err.println( "Unknown print form: " + v );
+ throw new TerminationException( 0 );
}
}
Modified: jena/trunk/jena-arq/src/main/java/arq/qparse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/qparse.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/qparse.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/qparse.java Tue Jun 24 09:06:50 2014
@@ -91,22 +91,51 @@ public class qparse extends CmdARQ
printOpt = true ;
}
- for ( Iterator<String> iter = getValues(argDeclPrint).iterator() ; iter.hasNext() ; )
+ for ( String arg : getValues( argDeclPrint ) )
{
- String arg = iter.next() ;
- if ( arg.equalsIgnoreCase("query")) { printQuery = true ; }
- else if ( arg.equalsIgnoreCase("op") ||
- arg.equalsIgnoreCase("alg") ||
- arg.equalsIgnoreCase("algebra") ) { printOp = true ; }
- else if ( arg.equalsIgnoreCase("quad")) { printQuad = true ; }
- else if ( arg.equalsIgnoreCase("quads")) { printQuad = true ; }
- else if ( arg.equalsIgnoreCase("plan")) { printPlan = true ; }
- else if ( arg.equalsIgnoreCase("opt")) { printOpt = true ; }
- else if ( arg.equalsIgnoreCase("optquad")) { printQuadOpt = true ; }
- else if ( arg.equalsIgnoreCase("quadopt")) { printQuadOpt = true ; }
- else if ( arg.equalsIgnoreCase("none")) { printNone = true ; }
+ if ( arg.equalsIgnoreCase( "query" ) )
+ {
+ printQuery = true;
+ }
+ else if ( arg.equalsIgnoreCase( "op" ) ||
+ arg.equalsIgnoreCase( "alg" ) ||
+ arg.equalsIgnoreCase( "algebra" ) )
+ {
+ printOp = true;
+ }
+ else if ( arg.equalsIgnoreCase( "quad" ) )
+ {
+ printQuad = true;
+ }
+ else if ( arg.equalsIgnoreCase( "quads" ) )
+ {
+ printQuad = true;
+ }
+ else if ( arg.equalsIgnoreCase( "plan" ) )
+ {
+ printPlan = true;
+ }
+ else if ( arg.equalsIgnoreCase( "opt" ) )
+ {
+ printOpt = true;
+ }
+ else if ( arg.equalsIgnoreCase( "optquad" ) )
+ {
+ printQuadOpt = true;
+ }
+ else if ( arg.equalsIgnoreCase( "quadopt" ) )
+ {
+ printQuadOpt = true;
+ }
+ else if ( arg.equalsIgnoreCase( "none" ) )
+ {
+ printNone = true;
+ }
else
- throw new CmdException("Not a recognized print form: "+arg+" : Choices are: query, op, quad, opt, optquad") ;
+ {
+ throw new CmdException(
+ "Not a recognized print form: " + arg + " : Choices are: query, op, quad, opt, optquad" );
+ }
}
if ( ! printQuery && ! printOp && ! printQuad && ! printPlan && ! printOpt && ! printQuadOpt && ! printNone )
@@ -231,7 +260,7 @@ public class qparse extends CmdARQ
// printf ... java 1.5 .. mutter,mutter
static String padOut(String x, int len)
{
- StringBuffer r = new StringBuffer(x) ;
+ StringBuilder r = new StringBuilder(x) ;
for ( int i = x.length() ; i <= len ; i++ )
r.append(" ") ;
return r.toString() ;
Modified: jena/trunk/jena-arq/src/main/java/arq/query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/query.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/query.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/query.java Tue Jun 24 09:06:50 2014
@@ -240,8 +240,7 @@ public class query extends CmdARQ
//System.err.println(qEx.getMessage()) ;
throw new CmdException("Query Exeception", qEx) ;
}
- catch (JenaException ex) { throw ex ; }
- catch (CmdException ex) { throw ex ; }
+ catch (JenaException | CmdException ex) { throw ex ; }
catch (Exception ex)
{
throw new CmdException("Exception", ex) ;
Modified: jena/trunk/jena-arq/src/main/java/arq/rupdate.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/rupdate.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/rupdate.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/rupdate.java Tue Jun 24 09:06:50 2014
@@ -18,7 +18,6 @@
package arq;
-import java.util.Iterator ;
import java.util.List ;
import arq.cmd.CmdException ;
@@ -74,20 +73,17 @@ public class rupdate extends CmdARQ
}
String endpoint = modRemote.getServiceURL() ;
-
- for ( Iterator<String> iter = requestFiles.iterator() ; iter.hasNext() ; )
+ for ( String filename : requestFiles )
{
- String filename = iter.next();
- UpdateRequest req = UpdateFactory.read(filename) ;
- exec(endpoint, req) ;
+ UpdateRequest req = UpdateFactory.read( filename );
+ exec( endpoint, req );
}
-
- for ( Iterator<String> iter = super.getPositional().iterator() ; iter.hasNext() ; )
+
+ for ( String requestString : super.getPositional() )
{
- String requestString = iter.next();
- requestString = indirect(requestString) ;
- UpdateRequest req = UpdateFactory.create(requestString) ;
- exec(endpoint, req) ;
+ requestString = indirect( requestString );
+ UpdateRequest req = UpdateFactory.create( requestString );
+ exec( endpoint, req );
}
}
Modified: jena/trunk/jena-arq/src/main/java/arq/uparse.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/uparse.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/uparse.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/uparse.java Tue Jun 24 09:06:50 2014
@@ -19,7 +19,6 @@
package arq;
import java.io.IOException ;
-import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.atlas.io.IndentedLineBuffer ;
@@ -64,14 +63,22 @@ public class uparse extends CmdARQ
super.processModulesAndArgs() ;
if ( super.cmdStrictMode )
updateSyntax = Syntax.syntaxSPARQL_11 ;
-
- for ( Iterator<String> iter = getValues(argDeclPrint).iterator() ; iter.hasNext() ; )
+
+ for ( String arg : getValues( argDeclPrint ) )
{
- String arg = iter.next() ;
- if ( arg.equalsIgnoreCase("query")) { printUpdate = true ; }
- else if ( arg.equalsIgnoreCase("none")) { printNone = true ; }
+ if ( arg.equalsIgnoreCase( "query" ) )
+ {
+ printUpdate = true;
+ }
+ else if ( arg.equalsIgnoreCase( "none" ) )
+ {
+ printNone = true;
+ }
else
- throw new CmdException("Not a recognized print form: "+arg+" : Choices are: query, op, quad, opt, optquad") ;
+ {
+ throw new CmdException(
+ "Not a recognized print form: " + arg + " : Choices are: query, op, quad, opt, optquad" );
+ }
}
if ( !printUpdate && ! printNone )
@@ -88,19 +95,19 @@ public class uparse extends CmdARQ
@Override
protected void exec()
{
- for ( Iterator<String> iter = requestFiles.listIterator() ; iter.hasNext() ; )
+ for ( String filename : requestFiles )
{
- String filename = iter.next();
- String x = oneFile(filename) ;
+ String x = oneFile( filename );
if ( x != null )
- execOne(x) ;
+ {
+ execOne( x );
+ }
}
-
- for ( Iterator<String> iter = super.positionals.listIterator() ; iter.hasNext() ; )
+
+ for ( String x : super.positionals )
{
- String x = iter.next();
- x = indirect(x) ;
- execOne(x) ;
+ x = indirect( x );
+ execOne( x );
}
}
Modified: jena/trunk/jena-arq/src/main/java/arq/update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/update.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/update.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/update.java Tue Jun 24 09:06:50 2014
@@ -18,7 +18,6 @@
package arq;
-import java.util.Iterator ;
import java.util.List ;
import org.apache.jena.riot.Lang ;
@@ -78,29 +77,37 @@ public class update extends CmdUpdate
throw new CmdException("Nothing to do") ;
Transactional transactional = (graphStore instanceof Transactional ) ? (Transactional)graphStore : new TransactionalNull() ;
-
- for ( Iterator<String> iter = requestFiles.iterator() ; iter.hasNext() ; )
+
+ for ( String filename : requestFiles )
{
- String filename = iter.next();
- try {
- transactional.begin(ReadWrite.WRITE) ;
- execOneFile(filename, graphStore) ;
- transactional.commit() ;
- } finally { transactional.end() ; }
+ try
+ {
+ transactional.begin( ReadWrite.WRITE );
+ execOneFile( filename, graphStore );
+ transactional.commit();
+ }
+ finally
+ {
+ transactional.end();
+ }
}
-
- for ( Iterator<String> iter = super.getPositional().iterator() ; iter.hasNext() ; )
+
+ for ( String requestString : super.getPositional() )
{
- String requestString = iter.next();
- requestString = indirect(requestString) ;
-
- try {
- transactional.begin(ReadWrite.WRITE) ;
- execOne(requestString, graphStore) ;
- transactional.commit() ;
- } finally { transactional.end() ; }
-
-
+ requestString = indirect( requestString );
+
+ try
+ {
+ transactional.begin( ReadWrite.WRITE );
+ execOne( requestString, graphStore );
+ transactional.commit();
+ }
+ finally
+ {
+ transactional.end();
+ }
+
+
}
SystemARQ.sync(graphStore) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ARQ.java Tue Jun 24 09:06:50 2014
@@ -145,7 +145,7 @@ public class ARQ
/** Turn on/off processing of blank node labels in queries */
public static void enableBlankNodeResultLabels(boolean val)
{
- Boolean b = Boolean.valueOf(val) ;
+ Boolean b = val;
globalContext.set(inputGraphBNodeLabels, b) ;
globalContext.set(outputGraphBNodeLabels, b) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/BIOInput.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/BIOInput.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/BIOInput.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/BIOInput.java Tue Jun 24 09:06:50 2014
@@ -41,8 +41,8 @@ public class BIOInput
// Trade off of guessing first line is all the VARS and coping with
// anything possible. -> Cope with anything possible.
BindingInputStream bin = new BindingInputStream(input) ;
- List<Binding> bindings = new ArrayList<Binding>() ;
- List<Var> vars = new ArrayList<Var>() ;
+ List<Binding> bindings = new ArrayList<>() ;
+ List<Var> vars = new ArrayList<>() ;
while(bin.hasNext())
{
Binding b = bin.next();
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ParameterizedSparqlString.java Tue Jun 24 09:06:50 2014
@@ -140,8 +140,8 @@ public class ParameterizedSparqlString i
private StringBuilder cmd = new StringBuilder();
private String baseUri;
- private Map<String, Node> params = new HashMap<String, Node>();
- private Map<Integer, Node> positionalParams = new HashMap<Integer, Node>();
+ private Map<String, Node> params = new HashMap<>();
+ private Map<Integer, Node> positionalParams = new HashMap<>();
private PrefixMapping prefixes;
/**
@@ -1139,7 +1139,7 @@ public class ParameterizedSparqlString i
*/
public Iterator<Integer> getEligiblePositionalParameters() {
Pattern p = Pattern.compile("(\\?)[\\s;,.]");
- List<Integer> positions = new ArrayList<Integer>();
+ List<Integer> positions = new ArrayList<>();
int index = 0;
Matcher matcher = p.matcher(this.cmd.toString());
while (matcher.find()) {
@@ -1311,16 +1311,18 @@ public class ParameterizedSparqlString i
// Go ahead and inject Variable Parameters
SerializationContext context = new SerializationContext(this.prefixes);
context.setBaseIRI(this.baseUri);
- Iterator<String> vars = this.params.keySet().iterator();
- while (vars.hasNext()) {
- String var = vars.next();
- Node n = this.params.get(var);
- if (n == null)
+ for ( String var : this.params.keySet() )
+ {
+ Node n = this.params.get( var );
+ if ( n == null )
+ {
continue;
- this.validateSafeToInject(command, var, n);
+ }
+ this.validateSafeToInject( command, var, n );
- p = Pattern.compile("([?$]" + var + ")([^\\w]|$)");
- command = p.matcher(command).replaceAll(Matcher.quoteReplacement(this.stringForNode(n, context)) + "$2");
+ p = Pattern.compile( "([?$]" + var + ")([^\\w]|$)" );
+ command =
+ p.matcher( command ).replaceAll( Matcher.quoteReplacement( this.stringForNode( n, context ) ) + "$2" );
}
// Then inject Positional Parameters
@@ -1357,15 +1359,14 @@ public class ParameterizedSparqlString i
}
// Then pre-pend prefixes
- Iterator<String> pre = this.prefixes.getNsPrefixMap().keySet().iterator();
- while (pre.hasNext()) {
- String prefix = pre.next();
- finalCmd.append("PREFIX ");
- finalCmd.append(prefix);
- finalCmd.append(": ");
- finalCmd.append(FmtUtils.stringForURI(this.prefixes.getNsPrefixURI(prefix), null, null));
- finalCmd.append('\n');
+ for ( String prefix : this.prefixes.getNsPrefixMap().keySet() )
+ {
+ finalCmd.append( "PREFIX " );
+ finalCmd.append( prefix );
+ finalCmd.append( ": " );
+ finalCmd.append( FmtUtils.stringForURI( this.prefixes.getNsPrefixURI( prefix ), null, null ) );
+ finalCmd.append( '\n' );
}
finalCmd.append(command);
@@ -1513,8 +1514,8 @@ public class ParameterizedSparqlString i
*
*/
private class DelimiterInfo {
- private List<Pair<Integer, String>> starts = new ArrayList<Pair<Integer, String>>();
- private Map<Integer, Integer> stops = new HashMap<Integer, Integer>();
+ private List<Pair<Integer, String>> starts = new ArrayList<>();
+ private Map<Integer, Integer> stops = new HashMap<>();
/**
* Parse delimiters from a string, discards any previously parsed
@@ -1628,7 +1629,7 @@ public class ParameterizedSparqlString i
}
public void addStart(int index, String delim) {
- this.starts.add(new Pair<Integer, String>(index, delim));
+ this.starts.add(new Pair<>(index, delim));
}
public void addStop(int start, int stop) {
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Query.java Tue Jun 24 09:06:50 2014
@@ -72,8 +72,8 @@ public class Query extends Prologue impl
// If no model is provided explicitly, the query engine will load
// a model from the URL. Never a list of zero items.
- private List<String> graphURIs = new ArrayList<String>() ;
- private List<String> namedGraphURIs = new ArrayList<String>() ;
+ private List<String> graphURIs = new ArrayList<>() ;
+ private List<String> namedGraphURIs = new ArrayList<>() ;
// The WHERE clause
private Element queryPattern = null ;
@@ -110,7 +110,7 @@ public class Query extends Prologue impl
// DESCRIBE
// Any URIs/QNames in the DESCRIBE clause
// Also uses resultVars
- protected List<Node> resultNodes = new ArrayList<Node>() ; // Type in list: Node
+ protected List<Node> resultNodes = new ArrayList<>() ; // Type in list: Node
/**
* Creates a new empty query
@@ -216,7 +216,7 @@ public class Query extends Prologue impl
public void addOrderBy(SortCondition condition)
{
if ( orderBy == null )
- orderBy = new ArrayList<SortCondition>() ;
+ orderBy = new ArrayList<>() ;
orderBy.add(condition) ;
}
@@ -281,7 +281,7 @@ public class Query extends Prologue impl
public void addGraphURI(String s)
{
if ( graphURIs == null )
- graphURIs = new ArrayList<String>() ;
+ graphURIs = new ArrayList<>() ;
graphURIs.add(s) ;
}
@@ -292,7 +292,7 @@ public class Query extends Prologue impl
public void addNamedGraphURI(String uri)
{
if ( namedGraphURIs == null )
- namedGraphURIs = new ArrayList<String>() ;
+ namedGraphURIs = new ArrayList<>() ;
if ( namedGraphURIs.contains(uri) )
throw new QueryException("URI already in named graph set: "+uri) ;
else
@@ -382,20 +382,19 @@ public class Query extends Prologue impl
/** Add a collection of projection variables to a SELECT query */
public void addProjectVars(Collection<?> vars)
{
- for ( Iterator<?> iter = vars.iterator() ; iter.hasNext() ; )
+ for ( Object obj : vars )
{
- Object obj = iter.next();
if ( obj instanceof String )
{
- this.addResultVar((String)obj) ;
- continue ;
+ this.addResultVar( (String) obj );
+ continue;
}
if ( obj instanceof Var )
{
- this.addResultVar((Var)obj) ;
- continue ;
+ this.addResultVar( (Var) obj );
+ continue;
}
- throw new QueryException("Not a variable or variable name: "+obj) ;
+ throw new QueryException( "Not a variable or variable name: " + obj );
}
resultVarsSet = true ;
}
@@ -484,7 +483,7 @@ public class Query extends Prologue impl
}
protected VarExprList groupVars = new VarExprList() ;
- protected List<Expr> havingExprs = new ArrayList<Expr>() ; // Expressions : Make an ExprList?
+ protected List<Expr> havingExprs = new ArrayList<>() ; // Expressions : Make an ExprList?
public boolean hasGroupBy() { return ! groupVars.isEmpty() || getAggregators().size() > 0 ; }
public boolean hasHaving() { return havingExprs != null && havingExprs.size() > 0 ; }
@@ -538,11 +537,11 @@ public class Query extends Prologue impl
// Unlike SELECT expressions, here the expression itself (E_Aggregator) knows its variable
// Commonality?
- private List<ExprAggregator> aggregators = new ArrayList<ExprAggregator>() ;
- private Map<Var, ExprAggregator> aggregatorsMap = new HashMap<Var, ExprAggregator>() ;
+ private List<ExprAggregator> aggregators = new ArrayList<>() ;
+ private Map<Var, ExprAggregator> aggregatorsMap = new HashMap<>() ;
// Note any E_Aggregator created for reuse.
- private Map<String, Var> aggregatorsAllocated = new HashMap<String, Var>() ;
+ private Map<String, Var> aggregatorsAllocated = new HashMap<>() ;
public boolean hasAggregators() { return aggregators.size() != 0 ; }
public List<ExprAggregator> getAggregators() { return aggregators ; }
@@ -688,7 +687,7 @@ public class Query extends Prologue impl
else
{
// Binding variables -- in patterns, not in filters and not in EXISTS
- LinkedHashSet<Var> queryVars = new LinkedHashSet<Var>() ;
+ LinkedHashSet<Var> queryVars = new LinkedHashSet<>() ;
PatternVars.vars(queryVars, this.getQueryPattern()) ;
if ( this.hasValues() )
queryVars.addAll(getValuesVariables()) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QuerySolutionMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QuerySolutionMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QuerySolutionMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/QuerySolutionMap.java Tue Jun 24 09:06:50 2014
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.sparql.util.FmtUt
public class QuerySolutionMap extends QuerySolutionBase
{
- private Map<String, RDFNode> map = new HashMap<String, RDFNode>() ;
+ private Map<String, RDFNode> map = new HashMap<>() ;
public QuerySolutionMap() { }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFormatter.java Tue Jun 24 09:06:50 2014
@@ -224,7 +224,7 @@ public class ResultSetFormatter
*/
static public List<QuerySolution> toList(ResultSet resultSet)
{
- List<QuerySolution> list = new ArrayList<QuerySolution>() ;
+ List<QuerySolution> list = new ArrayList<>() ;
for ( ; resultSet.hasNext() ; )
{
QuerySolution result =
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Syntax.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Syntax.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Syntax.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/Syntax.java Tue Jun 24 09:06:50 2014
@@ -71,7 +71,7 @@ public class Syntax extends Symbol
// /** The update syntax currently that is standardized, published, SPARQL - the "default SPARQL Update" */
// private static final Syntax syntaxSPARQL_Update = syntaxSPARQL_11_Update ;
- public static TranslationTable<Syntax> querySyntaxNames = new TranslationTable<Syntax>(true) ;
+ public static TranslationTable<Syntax> querySyntaxNames = new TranslationTable<>(true) ;
static {
querySyntaxNames.put("sparql", syntaxSPARQL) ;
querySyntaxNames.put("sparql10", syntaxSPARQL_10) ;
@@ -83,7 +83,7 @@ public class Syntax extends Symbol
querySyntaxNames.put("op", syntaxAlgebra) ;
}
- public static TranslationTable<Syntax> updateSyntaxNames = new TranslationTable<Syntax>(true) ;
+ public static TranslationTable<Syntax> updateSyntaxNames = new TranslationTable<>(true) ;
static {
querySyntaxNames.put("sparql", syntaxSPARQL) ;
querySyntaxNames.put("sparql_11", syntaxSPARQL_11) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/SystemARQ.java Tue Jun 24 09:06:50 2014
@@ -149,7 +149,7 @@ public class SystemARQ
}
- private static List<SystemInfo> versions = new ArrayList<SystemInfo>() ;
+ private static List<SystemInfo> versions = new ArrayList<>() ;
public static void registerSubSystem(SystemInfo systemInfo)
{
ARQMgt.register(systemInfo.getJmxPath()+".system:type=SystemInfo", systemInfo) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraGenerator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraGenerator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraGenerator.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraGenerator.java Tue Jun 24 09:06:50 2014
@@ -198,13 +198,14 @@ public class AlgebraGenerator
// Compile the consolidated group elements.
// "current" is the completed part only - there may be thing pushed into the accumulator.
Op current = OpTable.unit() ;
- Deque<Op> acc = new ArrayDeque<Op>() ;
-
- for (Iterator<Element> iter = groupElts.listIterator() ; iter.hasNext() ; )
+ Deque<Op> acc = new ArrayDeque<>() ;
+
+ for ( Element elt : groupElts )
{
- Element elt = iter.next() ;
if ( elt != null )
- current = compileOneInGroup(elt, current, acc) ;
+ {
+ current = compileOneInGroup( elt, current, acc );
+ }
}
// Deal with any remaining ops.
@@ -227,7 +228,7 @@ public class AlgebraGenerator
protected Pair<List<Expr>, List<Element>> prepareGroup(ElementGroup groupElt)
{
- List<Element> groupElts = new ArrayList<Element>() ;
+ List<Element> groupElts = new ArrayList<>() ;
PathBlock currentPathBlock = null ;
List<Expr> filters = null ;
@@ -240,7 +241,7 @@ public class AlgebraGenerator
// It's also illegal SPARQL - filters operate over the whole group.
ElementFilter f = (ElementFilter)elt ;
if ( filters == null )
- filters = new ArrayList<Expr>() ;
+ filters = new ArrayList<>() ;
filters.add(f.getExpr()) ;
// Collect filters but do not place them yet.
continue ;
@@ -541,7 +542,7 @@ public class AlgebraGenerator
VarExprList projectVars = query.getProject() ;
VarExprList exprs = new VarExprList() ; // Assignments to be done.
- List<Var> vars = new ArrayList<Var>() ; // projection variables
+ List<Var> vars = new ArrayList<>() ; // projection variables
Op op = pattern ;
@@ -611,7 +612,7 @@ public class AlgebraGenerator
// ---- ORDER BY
if ( query.getOrderBy() != null )
{
- List<SortCondition> scList = new ArrayList<SortCondition>() ;
+ List<SortCondition> scList = new ArrayList<>() ;
// Aggregates in ORDER BY
for ( SortCondition sc : query.getOrderBy() )
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/AlgebraQuad.java Tue Jun 24 09:06:50 2014
@@ -45,7 +45,7 @@ public class AlgebraQuad extends Transfo
public static Op quadize(Op op)
{
- final Deque<QuadSlot> stack = new ArrayDeque<QuadSlot>() ;
+ final Deque<QuadSlot> stack = new ArrayDeque<>() ;
QuadSlot qSlot = new QuadSlot(Quad.defaultGraphNodeGenerated, Quad.defaultGraphNodeGenerated) ;
stack.push(qSlot) ; // Starting condition
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpAsQuery.java Tue Jun 24 09:06:50 2014
@@ -53,7 +53,7 @@ public class OpAsQuery
private static Set<Var> allocProjectVars()
{
- return new LinkedHashSet<Var>() ;
+ return new LinkedHashSet<>() ;
}
private static void addProjectVar(Collection<Var> vars, Var var)
@@ -69,9 +69,9 @@ public class OpAsQuery
private Op op ;
private Element element = null ;
private ElementGroup currentGroup = null ;
- private Deque<ElementGroup> stack = new ArrayDeque<ElementGroup>() ;
+ private Deque<ElementGroup> stack = new ArrayDeque<>() ;
private Collection<Var> projectVars = allocProjectVars();
- private Map<Var, Expr> varExpression = new HashMap<Var, Expr>() ;
+ private Map<Var, Expr> varExpression = new HashMap<>() ;
private int groupDepth = 0;
private boolean inProject = false;
private boolean hasRun = false;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpExtRegistry.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpExtRegistry.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpExtRegistry.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpExtRegistry.java Tue Jun 24 09:06:50 2014
@@ -31,7 +31,7 @@ import com.hp.hpl.jena.sparql.sse.builde
public class OpExtRegistry
{
// Known extensions.
- static Map<String, OpExtBuilder> extensions = new HashMap<String, OpExtBuilder>() ;
+ static Map<String, OpExtBuilder> extensions = new HashMap<>() ;
// Wire in (ext NAME ...) form
static { BuilderOp.add(Tags.tagExt, new BuildExtExt()) ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpPrefixesUsed.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpPrefixesUsed.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpPrefixesUsed.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpPrefixesUsed.java Tue Jun 24 09:06:50 2014
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.sparql.algebra;
-import java.util.Iterator ;
import java.util.Map ;
import com.hp.hpl.jena.graph.Node ;
@@ -96,17 +95,16 @@ public class OpPrefixesUsed
if ( usedPMap.shortForm(uri) != uri )
return ;
-
- for ( Iterator<Map.Entry<String, String>> iter = pmap.entrySet().iterator() ; iter.hasNext() ; )
+
+ for ( Map.Entry<String, String> e : pmap.entrySet() )
{
- Map.Entry<String, String> e = iter.next();
- String k = e.getKey() ;
- String v = e.getValue() ;
-
- if ( uri.startsWith(v) )
+ String k = e.getKey();
+ String v = e.getValue();
+
+ if ( uri.startsWith( v ) )
{
- usedPMap.setNsPrefix(k, v) ;
- return ;
+ usedPMap.setNsPrefix( k, v );
+ return;
}
}
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java Tue Jun 24 09:06:50 2014
@@ -42,7 +42,7 @@ public class OpVars
// Choose the default collector - LinkedHashSet is predictable and
// keeps the "found" order
private static Set<Var> collector() {
- return new LinkedHashSet<Var>() ;
+ return new LinkedHashSet<>() ;
}
public static Set<Var> visibleVars(Op op) {
@@ -395,7 +395,7 @@ public class OpVars
}
private void clear(Set<Var> acc, List<Var> visible) {
- List<Var> toRemove = new ArrayList<Var>();
+ List<Var> toRemove = new ArrayList<>();
for (Var found : acc)
{
if (!visible.contains(found)) {
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/PropertyFunctionGenerator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/PropertyFunctionGenerator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/PropertyFunctionGenerator.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/PropertyFunctionGenerator.java Tue Jun 24 09:06:50 2014
@@ -20,7 +20,6 @@ package com.hp.hpl.jena.sparql.algebra;
import java.util.ArrayList ;
import java.util.HashMap ;
-import java.util.Iterator ;
import java.util.List ;
import java.util.Map ;
@@ -61,7 +60,7 @@ public class PropertyFunctionGenerator
// 3/ For remaining triples, put into basic graph patterns,
// and string together the procedure calls and BGPs.
- List<Triple> propertyFunctionTriples = new ArrayList<Triple>() ; // Property functions seen
+ List<Triple> propertyFunctionTriples = new ArrayList<>() ; // Property functions seen
BasicPattern triples = new BasicPattern(pattern) ; // A copy of all triples (later, it is mutated)
// Find the triples invoking property functions, and those not.
@@ -71,7 +70,7 @@ public class PropertyFunctionGenerator
//No property functions.
return new OpBGP(pattern) ;
- Map<Triple, PropertyFunctionInstance> pfInvocations = new HashMap<Triple, PropertyFunctionInstance>() ; // Map triple => property function instance
+ Map<Triple, PropertyFunctionInstance> pfInvocations = new HashMap<>() ; // Map triple => property function instance
// Removes triples of list arguments. This mutates 'triples'
findPropertyFunctionArgs(context, triples, propertyFunctionTriples, pfInvocations) ;
@@ -103,11 +102,10 @@ public class PropertyFunctionGenerator
// Step 2 : for each property function, remove associated triples in list arguments;
// Leave the propertyFunction triple itself.
- for ( Iterator<Triple> iter = propertyFunctionTriples.iterator() ; iter.hasNext(); )
+ for ( Triple pf : propertyFunctionTriples )
{
- Triple pf = iter.next();
- PropertyFunctionInstance pfi = magicProperty(context, pf, triples) ;
- pfInvocations.put(pf, pfi) ;
+ PropertyFunctionInstance pfi = magicProperty( context, pf, triples );
+ pfInvocations.put( pf, pfi );
}
}
@@ -211,7 +209,7 @@ public class PropertyFunctionGenerator
Triple pfTriple,
BasicPattern triples)
{
- List<Triple> listTriples = new ArrayList<Triple>() ;
+ List<Triple> listTriples = new ArrayList<>() ;
GNode sGNode = new GNode(triples, pfTriple.getSubject()) ;
GNode oGNode = new GNode(triples, pfTriple.getObject()) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/TransformUnionQuery.java Tue Jun 24 09:06:50 2014
@@ -41,7 +41,7 @@ public class TransformUnionQuery extends
}
// ** SEE AlgebraQuad : Pusher and Popper :share.
- Deque<Node> currentGraph = new ArrayDeque<Node>() ;
+ Deque<Node> currentGraph = new ArrayDeque<>() ;
public TransformUnionQuery()
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/Transformer.java Tue Jun 24 09:06:50 2014
@@ -158,7 +158,7 @@ public class Transformer
protected final Transform transform ;
private final ExprTransform exprTransform ;
- private final Deque<Op> stack = new ArrayDeque<Op>() ;
+ private final Deque<Op> stack = new ArrayDeque<>() ;
protected final Op pop()
{ return stack.pop(); }
@@ -202,7 +202,7 @@ public class Transformer
public void visit(OpOrder opOrder)
{
List<SortCondition> conditions = opOrder.getConditions() ;
- List<SortCondition> conditions2 = new ArrayList<SortCondition>() ;
+ List<SortCondition> conditions2 = new ArrayList<>() ;
boolean changed = false ;
for ( SortCondition sc : conditions )
@@ -308,7 +308,7 @@ public class Transformer
List<ExprAggregator> aggs2 = aggs ;
//And the aggregators...
- aggs2 = new ArrayList<ExprAggregator>() ;
+ aggs2 = new ArrayList<>() ;
for ( ExprAggregator agg : aggs )
{
Aggregator aggregator = agg.getAggregator() ;
@@ -372,7 +372,7 @@ public class Transformer
@Override
protected void visitN(OpN op)
{
- List<Op> x = new ArrayList<Op>(op.size()) ;
+ List<Op> x = new ArrayList<>(op.size()) ;
for ( Iterator<Op> iter = op.iterator() ; iter.hasNext() ; )
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpN.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpN.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpN.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpN.java Tue Jun 24 09:06:50 2014
@@ -28,9 +28,9 @@ import com.hp.hpl.jena.sparql.util.NodeI
public abstract class OpN extends OpBase
{
- private List<Op> elements = new ArrayList<Op>() ;
+ private List<Op> elements = new ArrayList<>() ;
- protected OpN() { elements = new ArrayList<Op>() ; }
+ protected OpN() { elements = new ArrayList<>() ; }
protected OpN(List<Op> x) { elements = x ; }
/** Accumulate an op in the OpN.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpProject.java Tue Jun 24 09:06:50 2014
@@ -32,7 +32,7 @@ import com.hp.hpl.jena.sparql.util.NodeI
public class OpProject extends OpModifier
{
- private List<Var> vars = new ArrayList<Var>() ;
+ private List<Var> vars = new ArrayList<>() ;
public OpProject(Op subOp, List<Var> vars)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/op/OpQuadBlock.java Tue Jun 24 09:06:50 2014
@@ -85,7 +85,7 @@ public class OpQuadBlock extends Op0
public Op0 copy() { return new OpQuadBlock(quads) ; }
public List<OpQuadPattern> convert() {
- List<OpQuadPattern> x = new ArrayList<OpQuadPattern>() ;
+ List<OpQuadPattern> x = new ArrayList<>() ;
Node gn = null ;
BasicPattern bgp = null ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformConstantFold.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformConstantFold.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformConstantFold.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/ExprTransformConstantFold.java Tue Jun 24 09:06:50 2014
@@ -68,7 +68,7 @@ public class ExprTransformConstantFold e
@Override
public Expr transform(ExprFunctionN func, ExprList args) {
if (isFoldable(args)) {
- List<NodeValue> args2 = new ArrayList<NodeValue>() ;
+ List<NodeValue> args2 = new ArrayList<>() ;
// Need to "cast" to constants
for ( Expr e : args )
args2.add(e.getConstant()) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformDistinctToReduced.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformDistinctToReduced.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformDistinctToReduced.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformDistinctToReduced.java Tue Jun 24 09:06:50 2014
@@ -77,7 +77,7 @@ public class TransformDistinctToReduced
OpProject opProject = (OpProject) subOp;
if (opProject.getSubOp() instanceof OpOrder) {
OpOrder opOrder = (OpOrder) opProject.getSubOp();
- Set<Var> projectVars = new HashSet<Var>(opProject.getVars()) ;
+ Set<Var> projectVars = new HashSet<>(opProject.getVars()) ;
if (isSafe(projectVars, opOrder)) {
return OpReduced.create(subOp);
}
@@ -103,7 +103,7 @@ public class TransformDistinctToReduced
} else if (subOp instanceof OpProject) {
OpProject opProject = (OpProject) subOp;
if (opProject.getSubOp() instanceof OpOrder) {
- projectVars = new HashSet<Var>(opProject.getVars()) ;
+ projectVars = new HashSet<>(opProject.getVars()) ;
opOrder = (OpOrder) opProject.getSubOp();
}
}
@@ -118,7 +118,7 @@ public class TransformDistinctToReduced
}
protected boolean isSafe(Set<Var> projectVars, OpOrder opOrder) {
- Set<Var> seenVars = new HashSet<Var>();
+ Set<Var> seenVars = new HashSet<>();
// For the optimization to be safe all project variables must appear in
// the ordering prior to any unprojected variables
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterDisjunction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterDisjunction.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterDisjunction.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterDisjunction.java Tue Jun 24 09:06:50 2014
@@ -64,7 +64,7 @@ public class TransformFilterDisjunction
ExprList exprList2 = new ExprList() ;
Op newOp = subOp ;
// remember what's been seen so that FILTER(?x = <x> || ?x = <x> ) does not result in two transforms.
- Set<Expr> doneSoFar = new HashSet<Expr>() ;
+ Set<Expr> doneSoFar = new HashSet<>() ;
for ( Expr expr : exprList )
{
@@ -142,7 +142,7 @@ public class TransformFilterDisjunction
{
// Not done.
if ( exprList2 == null )
- exprList2 = new ArrayList<Expr>() ;
+ exprList2 = new ArrayList<>() ;
exprList2.add(e) ;
//continue ;
// Can't do one so don't do any as the original pattern is still executed.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterEquality.java Tue Jun 24 09:06:50 2014
@@ -153,7 +153,7 @@ public class TransformFilterEquality ext
// --- find and extract
private static Pair<List<Pair<Var, NodeValue>>, ExprList> preprocessFilterEquality(ExprList exprs) {
- List<Pair<Var, NodeValue>> exprsFilterEquality = new ArrayList<Pair<Var, NodeValue>>();
+ List<Pair<Var, NodeValue>> exprsFilterEquality = new ArrayList<>();
ExprList exprsOther = new ExprList();
for (Expr e : exprs.getList()) {
Pair<Var, NodeValue> p = preprocess(e);
@@ -208,7 +208,7 @@ public class TransformFilterEquality ext
}
private static Collection<Var> varsMentionedInEqualityFilters(List<Pair<Var, NodeValue>> equalities) {
- Set<Var> vars = new HashSet<Var>();
+ Set<Var> vars = new HashSet<>();
for (Pair<Var, NodeValue> p : equalities)
vars.add(p.getLeft());
return vars;
@@ -337,7 +337,7 @@ public class TransformFilterEquality ext
}
private static List<Op> extractOptionals(Op op) {
- List<Op> chain = new ArrayList<Op>();
+ List<Op> chain = new ArrayList<>();
while (op instanceof OpConditional || op instanceof OpLeftJoin) {
Op2 opleftjoin2 = (Op2) op;
chain.add(opleftjoin2.getRight());
@@ -347,7 +347,7 @@ public class TransformFilterEquality ext
}
private static List<Op> processSpecialCase1(List<Op> ops, List<Pair<Var, NodeValue>> equalities) {
- List<Op> ops2 = new ArrayList<Op>();
+ List<Op> ops2 = new ArrayList<>();
Collection<Var> vars = varsMentionedInEqualityFilters(equalities);
for (Op op : ops) {
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterImplicitJoin.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterImplicitJoin.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterImplicitJoin.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterImplicitJoin.java Tue Jun 24 09:06:50 2014
@@ -170,7 +170,7 @@ public class TransformFilterImplicitJoin
// --- find and extract
private static Pair<List<Pair<Var, Var>>, ExprList> preprocessFilterImplicitJoin(Op subOp, ExprList exprs) {
- List<Pair<Var, Var>> exprsJoins = new ArrayList<Pair<Var, Var>>();
+ List<Pair<Var, Var>> exprsJoins = new ArrayList<>();
ExprList exprsOther = new ExprList();
for (Expr e : exprs.getList()) {
Pair<Var, Var> p = preprocess(subOp, e);
@@ -224,11 +224,11 @@ public class TransformFilterImplicitJoin
// If anything is used in the object/unknown position then we
// potentially have an issue unless it is also used in a safe
// position
- Set<Var> safeVars = new HashSet<Var>();
+ Set<Var> safeVars = new HashSet<>();
safeVars.addAll(varsByPosition.get(0));
safeVars.addAll(varsByPosition.get(1));
safeVars.addAll(varsByPosition.get(2));
- Set<Var> unsafeVars = new HashSet<Var>();
+ Set<Var> unsafeVars = new HashSet<>();
unsafeVars.addAll(varsByPosition.get(3));
unsafeVars.addAll(varsByPosition.get(4));
boolean lhsSafe = true, rhsSafe = true;
@@ -255,7 +255,7 @@ public class TransformFilterImplicitJoin
}
private static Collection<Var> varsMentionedInImplictJoins(List<Pair<Var, Var>> joins) {
- Set<Var> vars = new HashSet<Var>();
+ Set<Var> vars = new HashSet<>();
for (Pair<Var, Var> p : joins) {
vars.add(p.getLeft());
vars.add(p.getRight());
@@ -412,7 +412,7 @@ public class TransformFilterImplicitJoin
}
private static List<Op> extractOptionals(Op op) {
- List<Op> chain = new ArrayList<Op>();
+ List<Op> chain = new ArrayList<>();
while (op instanceof OpConditional || op instanceof OpLeftJoin) {
Op2 opleftjoin2 = (Op2) op;
chain.add(opleftjoin2.getRight());
@@ -422,7 +422,7 @@ public class TransformFilterImplicitJoin
}
private static List<Op> processSpecialCaseOptional(List<Op> ops, List<Pair<Var, Var>> joins) {
- List<Op> ops2 = new ArrayList<Op>();
+ List<Op> ops2 = new ArrayList<>();
Collection<Var> vars = varsMentionedInImplictJoins(joins);
for (Op op : ops) {
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterInequality.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterInequality.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterInequality.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterInequality.java Tue Jun 24 09:06:50 2014
@@ -166,7 +166,7 @@ public class TransformFilterInequality e
// --- find and extract
private static Pair<List<Pair<Var, NodeValue>>, ExprList> preprocessFilterInequality(ExprList exprs) {
- List<Pair<Var, NodeValue>> exprsFilterInequality = new ArrayList<Pair<Var, NodeValue>>();
+ List<Pair<Var, NodeValue>> exprsFilterInequality = new ArrayList<>();
ExprList exprsOther = new ExprList();
for (Expr e : exprs.getList()) {
Pair<Var, NodeValue> p = preprocess(e);
@@ -212,7 +212,7 @@ public class TransformFilterInequality e
}
private static Collection<Var> varsMentionedInInequalityFilters(List<Pair<Var, NodeValue>> inequalities) {
- Set<Var> vars = new HashSet<Var>();
+ Set<Var> vars = new HashSet<>();
for (Pair<Var, NodeValue> p : inequalities)
vars.add(p.getLeft());
return vars;
@@ -344,7 +344,7 @@ public class TransformFilterInequality e
}
private static List<Op> extractOptionals(Op op) {
- List<Op> chain = new ArrayList<Op>();
+ List<Op> chain = new ArrayList<>();
while (op instanceof OpConditional || op instanceof OpLeftJoin) {
Op2 opleftjoin2 = (Op2) op;
chain.add(opleftjoin2.getRight());
@@ -354,7 +354,7 @@ public class TransformFilterInequality e
}
private static List<Op> processSpecialCase1(List<Op> ops, List<Pair<Var, NodeValue>> inequalities) {
- List<Op> ops2 = new ArrayList<Op>();
+ List<Op> ops2 = new ArrayList<>();
Collection<Var> vars = varsMentionedInInequalityFilters(inequalities);
for (Op op : ops) {
@@ -385,7 +385,7 @@ public class TransformFilterInequality e
private static Op processFilterWorker(Op op, List<Pair<Var, NodeValue>> inequalities) {
// Firstly find all the possible values for each variable
- Map<Var, Set<NodeValue>> possibleValues = new HashMap<Var, Set<NodeValue>>();
+ Map<Var, Set<NodeValue>> possibleValues = new HashMap<>();
for (Pair<Var, NodeValue> inequalityTest : inequalities) {
if (!possibleValues.containsKey(inequalityTest.getLeft())) {
possibleValues.put(inequalityTest.getLeft(), new HashSet<NodeValue>());
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacement.java Tue Jun 24 09:06:50 2014
@@ -358,16 +358,18 @@ public class TransformFilterPlacement ex
List<Op> ops = opSequence.getElements() ;
Op op = null ;
- for (int i = 0 ; i < ops.size() ; i++ ) {
- op = insertAnyFilter$(exprs, varScope, op) ;
- Op seqElt = ops.get(i) ;
- Placement p = transform(exprs, seqElt) ;
- if ( p != null ) {
- exprs = p.unplaced ;
- seqElt = p.op ;
+ for ( Op op1 : ops )
+ {
+ op = insertAnyFilter$( exprs, varScope, op );
+ Op seqElt = op1;
+ Placement p = transform( exprs, seqElt );
+ if ( p != null )
+ {
+ exprs = p.unplaced;
+ seqElt = p.op;
}
- varScope.addAll(fixedVars(seqElt)) ;
- op = OpSequence.create(op, seqElt) ;
+ varScope.addAll( fixedVars( seqElt ) );
+ op = OpSequence.create( op, seqElt );
}
return result(op, exprs) ;
}
@@ -648,11 +650,13 @@ public class TransformFilterPlacement ex
if ( exprs == null || exprs.isEmpty() )
return op ;
- for (Iterator<Expr> iter = exprs.iterator(); iter.hasNext();) {
- Expr expr = iter.next() ;
+ for ( Expr expr : exprs )
+ {
if ( op == null )
- op = OpTable.unit() ;
- op = OpFilter.filter(expr, op) ;
+ {
+ op = OpTable.unit();
+ }
+ op = OpFilter.filter( expr, op );
}
return op ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacementConservative.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacementConservative.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacementConservative.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformFilterPlacementConservative.java Tue Jun 24 09:06:50 2014
@@ -74,7 +74,7 @@ public class TransformFilterPlacementCon
public Op transform(OpFilter opFilter, Op x) {
// Destructive use of exprs - copy it.
ExprList exprs = ExprList.copy(opFilter.getExprs());
- Set<Var> varsScope = new HashSet<Var>();
+ Set<Var> varsScope = new HashSet<>();
Op op = transform(exprs, varsScope, x);
if (op == x)
@@ -223,15 +223,15 @@ public class TransformFilterPlacementCon
// Any filters that depend on no variables.
Op op = insertAnyFilter(exprs, varScope, null);
- for (Iterator<Op> iter = ops.iterator(); iter.hasNext();) {
- Op seqElt = iter.next();
+ for ( Op seqElt : ops )
+ {
// Process the sequence element. This may insert filters (sequence
// or BGP)
- seqElt = transform(exprs, varScope, seqElt);
+ seqElt = transform( exprs, varScope, seqElt );
// Merge into sequence.
- op = OpSequence.create(op, seqElt);
+ op = OpSequence.create( op, seqElt );
// Place any filters now ready.
- op = insertAnyFilter(exprs, varScope, op);
+ op = insertAnyFilter( exprs, varScope, op );
}
return op;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformImplicitLeftJoin.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformImplicitLeftJoin.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformImplicitLeftJoin.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformImplicitLeftJoin.java Tue Jun 24 09:06:50 2014
@@ -208,7 +208,7 @@ public class TransformImplicitLeftJoin e
}
private static Pair<List<Pair<Var, Var>>, ExprList> preprocessFilterImplicitJoin(Op left, Op right, ExprList exprs) {
- List<Pair<Var, Var>> exprsJoins = new ArrayList<Pair<Var, Var>>();
+ List<Pair<Var, Var>> exprsJoins = new ArrayList<>();
ExprList exprsOther = new ExprList();
for (Expr e : exprs.getList()) {
Pair<Var, Var> p = preprocess(left, right, e);
@@ -268,11 +268,11 @@ public class TransformImplicitLeftJoin e
// If anything is used in the object/unknown position then we
// potentially have an issue unless it is also used in a safe
// position
- Set<Var> safeVars = new HashSet<Var>();
+ Set<Var> safeVars = new HashSet<>();
safeVars.addAll(varsByPosition.get(0));
safeVars.addAll(varsByPosition.get(1));
safeVars.addAll(varsByPosition.get(2));
- Set<Var> unsafeVars = new HashSet<Var>();
+ Set<Var> unsafeVars = new HashSet<>();
unsafeVars.addAll(varsByPosition.get(3));
unsafeVars.addAll(varsByPosition.get(4));
boolean lhsSafe = true, rhsSafe = true;
@@ -299,7 +299,7 @@ public class TransformImplicitLeftJoin e
}
private static Collection<Var> varsMentionedInImplictJoins(List<Pair<Var, Var>> joins) {
- Set<Var> vars = new HashSet<Var>();
+ Set<Var> vars = new HashSet<>();
for (Pair<Var, Var> p : joins) {
vars.add(p.getLeft());
vars.add(p.getRight());
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformMergeBGPs.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformMergeBGPs.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformMergeBGPs.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformMergeBGPs.java Tue Jun 24 09:06:50 2014
@@ -51,15 +51,14 @@ public class TransformMergeBGPs extends
// Check for two BGPs.
boolean xform = false ;
boolean previousBGP = false ;
-
- for ( int i = 0 ; i < elts.size() ; i++ )
+
+ for ( Op op1 : elts )
{
- Op op1 = elts.get(i) ;
- BasicPattern p1 = asBGP(op1) ;
+ BasicPattern p1 = asBGP( op1 );
if ( previousBGP && p1 != null )
{
- xform = true ;
- break ;
+ xform = true;
+ break;
}
previousBGP = ( p1 != null );
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformPathFlatternStd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformPathFlatternStd.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformPathFlatternStd.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformPathFlatternStd.java Tue Jun 24 09:06:50 2014
@@ -125,8 +125,8 @@ public class TransformPathFlatternStd ex
{
Op opFwd = null ;
Op opBwd = null ;
- List<P_Path0> forwards = new ArrayList<P_Path0>() ;
- List<P_Path0> backwards = new ArrayList<P_Path0>() ;
+ List<P_Path0> forwards = new ArrayList<>() ;
+ List<P_Path0> backwards = new ArrayList<>() ;
for ( P_Path0 p : pathNotOneOf.getNodes() )
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformSimplify.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformSimplify.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformSimplify.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/optimize/TransformSimplify.java Tue Jun 24 09:06:50 2014
@@ -32,7 +32,7 @@ public class TransformSimplify extends T
@Override
public Op transform(OpSequence opSequence, List<Op> elts)
{
- List<Op> x = new ArrayList<Op>(elts) ;
+ List<Op> x = new ArrayList<>(elts) ;
for ( Iterator<Op> iter = x.iterator() ; iter.hasNext() ; )
{
Op sub = iter.next() ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/Table1.java Tue Jun 24 09:06:50 2014
@@ -62,14 +62,14 @@ public class Table1 extends TableBase {
@Override
public List<Var> getVars() {
- List<Var> x = new ArrayList<Var>() ;
+ List<Var> x = new ArrayList<>() ;
x.add(var) ;
return x ;
}
@Override
public List<String> getVarNames() {
- List<String> x = new ArrayList<String>() ;
+ List<String> x = new ArrayList<>() ;
x.add(var.getVarName()) ;
return x ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableEmpty.java Tue Jun 24 09:06:50 2014
@@ -52,10 +52,10 @@ public class TableEmpty extends TableBas
public void closeTable() { }
@Override
- public List<String> getVarNames() { return new ArrayList<String>() ; }
+ public List<String> getVarNames() { return new ArrayList<>() ; }
@Override
- public List<Var> getVars() { return new ArrayList<Var>() ; }
+ public List<Var> getVars() { return new ArrayList<>() ; }
@Override
public String toString() { return "TableEmpty" ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableN.java Tue Jun 24 09:06:50 2014
@@ -29,8 +29,8 @@ import com.hp.hpl.jena.sparql.engine.bin
import com.hp.hpl.jena.sparql.engine.iterator.QueryIterPlainWrapper ;
public class TableN extends TableBase {
- protected List<Binding> rows = new ArrayList<Binding>() ;
- protected List<Var> vars = new ArrayList<Var>() ;
+ protected List<Binding> rows = new ArrayList<>() ;
+ protected List<Var> vars = new ArrayList<>() ;
public TableN() {}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/table/TableUnit.java Tue Jun 24 09:06:50 2014
@@ -62,10 +62,10 @@ public class TableUnit extends TableBase
public boolean isEmpty() { return false ; }
@Override
- public List<String> getVarNames() { return new ArrayList<String>() ; }
+ public List<String> getVarNames() { return new ArrayList<>() ; }
@Override
- public List<Var> getVars() { return new ArrayList<Var>() ; }
+ public List<Var> getVars() { return new ArrayList<>() ; }
@Override
public String toString() { return "TableUnit" ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DataFormat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DataFormat.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DataFormat.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DataFormat.java Tue Jun 24 09:06:50 2014
@@ -40,7 +40,7 @@ public class DataFormat extends Symbol
public static final DataFormat langN3
= new DataFormat(FileUtils.langN3 ) ;
- public static TranslationTable<DataFormat> dataSyntaxNames = new TranslationTable<DataFormat>(true) ;
+ public static TranslationTable<DataFormat> dataSyntaxNames = new TranslationTable<>(true) ;
static {
dataSyntaxNames.put("nt", langNTriples ) ;
dataSyntaxNames.put("n3", langN3 ) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesBatched.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesBatched.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesBatched.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesBatched.java Tue Jun 24 09:06:50 2014
@@ -87,7 +87,7 @@ public abstract class DatasetChangesBatc
private void startBatch()
{
if ( batchQuads == null )
- batchQuads = new ArrayList<Quad>() ;
+ batchQuads = new ArrayList<>() ;
}
protected void finishBatch()
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetChangesCapture.java Tue Jun 24 09:06:50 2014
@@ -34,7 +34,7 @@ public class DatasetChangesCapture imple
// with little guidance as to likely size, can lead to undesirable GC
// and copy-time issues.
// Using a LinkedList avoids this although it adds overhead for list entries.
- final private List<Pair<QuadAction, Quad>> actions = new LinkedList<Pair<QuadAction,Quad>>() ;
+ final private List<Pair<QuadAction, Quad>> actions = new LinkedList<>() ;
//new ArrayList<Pair<QuadAction, Quad>>() ;
final private boolean captureAdd ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetDescription.java Tue Jun 24 09:06:50 2014
@@ -37,8 +37,8 @@ import com.hp.hpl.jena.sparql.util.Datas
public class DatasetDescription
{
- private List<String> defaultGraphURIs = new ArrayList<String>() ;
- private List<String> namedGraphURIs = new ArrayList<String>() ;
+ private List<String> defaultGraphURIs = new ArrayList<>() ;
+ private List<String> namedGraphURIs = new ArrayList<>() ;
public static DatasetDescription create(List<String> defaultGraphURIs , List<String> namedGraphURIs)
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphMap.java Tue Jun 24 09:06:50 2014
@@ -30,7 +30,7 @@ import com.hp.hpl.jena.graph.Node ;
*/
public class DatasetGraphMap extends DatasetGraphCollection
{
- private Map<Node, Graph> graphs = new HashMap<Node, Graph>() ;
+ private Map<Node, Graph> graphs = new HashMap<>() ;
private Graph defaultGraph ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphOne.java Tue Jun 24 09:06:50 2014
@@ -59,7 +59,7 @@ public class DatasetGraphOne extends Dat
@Override
public Iterator<Node> listGraphNodes()
{
- return new NullIterator<Node>() ;
+ return new NullIterator<>() ;
}
@Override
@@ -158,7 +158,7 @@ public class DatasetGraphOne extends Dat
if ( isWildcard(g) || isDefaultGraph(g) )
return triples2quadsDftGraph(graph.find(s, p, o)) ;
else
- return new NullIterator<Quad>() ;
+ return new NullIterator<>() ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphReadOnly.java Tue Jun 24 09:06:50 2014
@@ -41,7 +41,7 @@ public class DatasetGraphReadOnly extend
return dftGraph ;
}
- private Map<Node, Graph> namedGraphs = new HashMap<Node, Graph>() ;
+ private Map<Node, Graph> namedGraphs = new HashMap<>() ;
@Override
public Graph getGraph(Node graphNode)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/DatasetGraphSimpleMem.java Tue Jun 24 09:06:50 2014
@@ -38,8 +38,8 @@ import com.hp.hpl.jena.util.iterator.Wra
*/
public class DatasetGraphSimpleMem extends DatasetGraphCaching
{
- private MiniSet<Triple> triples = new MiniSet<Triple>() ;
- private MiniSet<Quad> quads = new MiniSet<Quad>() ;
+ private MiniSet<Triple> triples = new MiniSet<>() ;
+ private MiniSet<Quad> quads = new MiniSet<>() ;
/** Simple abstraction of a Set */
private static class MiniSet<T> implements Iterable<T>
@@ -47,7 +47,7 @@ public class DatasetGraphSimpleMem exten
final Collection<T> store ;
MiniSet(Collection<T> store) { this.store = store ; }
- MiniSet() { this.store = new ArrayList<T>() ; }
+ MiniSet() { this.store = new ArrayList<>() ; }
void add(T t)
{
@@ -77,7 +77,7 @@ public class DatasetGraphSimpleMem exten
@Override
public Iterator<Quad> findInDftGraph(Node s, Node p , Node o)
{
- List<Quad> results = new ArrayList<Quad>() ;
+ List<Quad> results = new ArrayList<>() ;
for ( Triple t : triples )
if ( matches(t, s, p, o) )
// ?? Quad.defaultGraphNodeGenerated
@@ -89,7 +89,7 @@ public class DatasetGraphSimpleMem exten
@Override
public Iterator<Quad> findInSpecificNamedGraph(Node g, Node s, Node p , Node o)
{
- List<Quad> results = new ArrayList<Quad>() ;
+ List<Quad> results = new ArrayList<>() ;
for ( Quad q : quads )
if ( matches(q, g, s, p, o) )
results.add(q) ;
@@ -99,7 +99,7 @@ public class DatasetGraphSimpleMem exten
@Override
public Iterator<Quad> findInAnyNamedGraphs(Node s, Node p , Node o)
{
- List<Quad> results = new ArrayList<Quad>() ;
+ List<Quad> results = new ArrayList<>() ;
for ( Quad q : quads )
if ( matches(q, Node.ANY, s, p, o) )
results.add(q) ;
@@ -169,7 +169,7 @@ public class DatasetGraphSimpleMem exten
@Override
protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
{
- List<Triple> results = new ArrayList<Triple>() ;
+ List<Triple> results = new ArrayList<>() ;
for ( Triple t : triples )
if ( t.matches(m.getMatchSubject(), m.getMatchPredicate(), m.getMatchObject()) )
results.add(t) ;
@@ -196,7 +196,7 @@ public class DatasetGraphSimpleMem exten
@Override
protected ExtendedIterator<Triple> graphBaseFind(TripleMatch m)
{
- List<Triple> results = new ArrayList<Triple>() ;
+ List<Triple> results = new ArrayList<>() ;
Iterator<Quad> iter = findNG(graphName, m.getMatchSubject(), m.getMatchPredicate(), m.getMatchObject()) ;
for ( ; iter.hasNext() ; )
@@ -231,7 +231,7 @@ public class DatasetGraphSimpleMem exten
private Set<Node> graphNodes()
{
- Set<Node> x = new HashSet<Node>() ;
+ Set<Node> x = new HashSet<>() ;
for ( Quad q : quads )
x.add(q.getGraph()) ;
return x ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/PathBlock.java Tue Jun 24 09:06:50 2014
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.sparql.util.NodeI
public class PathBlock implements Iterable<TriplePath>
{
- private List<TriplePath> triplePaths = new ArrayList<TriplePath>() ;
+ private List<TriplePath> triplePaths = new ArrayList<>() ;
public PathBlock() {}
public PathBlock(PathBlock other) {triplePaths.addAll(other.triplePaths) ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/QuadPattern.java Tue Jun 24 09:06:50 2014
@@ -36,7 +36,7 @@ import com.hp.hpl.jena.sparql.util.NodeI
public class QuadPattern implements Iterable<Quad>
{
- private List<Quad> quads = new ArrayList<Quad>() ;
+ private List<Quad> quads = new ArrayList<>() ;
public QuadPattern() {}
public QuadPattern(QuadPattern other) {quads.addAll(other.quads) ; }
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/ResultBinding.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/ResultBinding.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/ResultBinding.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/ResultBinding.java Tue Jun 24 09:06:50 2014
@@ -69,7 +69,7 @@ public class ResultBinding extends Query
@Override
public Iterator<String> varNames()
{
- List<String> x = new ArrayList<String>() ;
+ List<String> x = new ArrayList<>() ;
for ( Iterator<Var> iter = binding.vars() ; iter.hasNext(); )
{
Var v = iter.next();
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Substitute.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Substitute.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Substitute.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Substitute.java Tue Jun 24 09:06:50 2014
@@ -135,7 +135,7 @@ public class Substitute
return new PropFuncArg(substitute(propFuncArg.getArg(), binding)) ;
}
- List<Node> newArgList = new ArrayList<Node>() ;
+ List<Node> newArgList = new ArrayList<>() ;
for ( Node n : propFuncArg.getArgList() )
newArgList.add(substitute(n, binding)) ;
return new PropFuncArg(newArgList) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Var.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Var.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Var.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/core/Var.java Tue Jun 24 09:06:50 2014
@@ -174,7 +174,7 @@ public class Var extends Node_Variable
/** Convert a collection of variable names to variables */
public static List<Var> varList(Collection<String> varNames)
{
- List<Var> x = new ArrayList<Var>() ;
+ List<Var> x = new ArrayList<>() ;
for (String obj : varNames)
x.add(Var.alloc(obj)) ;
return x ;
@@ -188,7 +188,7 @@ public class Var extends Node_Variable
/** Return a list of String names from a collection of variables */
public static List<String> varNames(Collection<Var> vars)
{
- List<String> x = new ArrayList<String>() ;
+ List<String> x = new ArrayList<>() ;
for (Var var : vars)
x.add(var.getVarName()) ;
return x ;