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 [5/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/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/LabelToNodeMap.java Tue Jun 24 09:06:50 2014
@@ -33,7 +33,7 @@ import com.hp.hpl.jena.sparql.core.VarAl
public class LabelToNodeMap
{
// Wil be replaced by LabelToNode in RIOT
- Map<String, Node> bNodeLabels = new HashMap<String, Node>() ;
+ Map<String, Node> bNodeLabels = new HashMap<>() ;
// Variables or bNodes?
// True means variables (query pattern)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappedLoader.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappedLoader.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappedLoader.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/MappedLoader.java Tue Jun 24 09:06:50 2014
@@ -19,7 +19,6 @@
package com.hp.hpl.jena.sparql.util;
import java.util.HashMap ;
-import java.util.Iterator ;
import java.util.Map ;
import com.hp.hpl.jena.sparql.ARQConstants ;
@@ -31,7 +30,7 @@ public class MappedLoader
// Map string => string of prefixes
// e.g. http://jena.hpl.hp.com/ARQ/property# => java:com.hp.hpl.jena.sparql.pfunction.
- static Map<String, String> uriMap = new HashMap<String, String>() ;
+ static Map<String, String> uriMap = new HashMap<>() ;
static {
// ARQ library
@@ -85,12 +84,13 @@ public class MappedLoader
private static Map.Entry<String,String> find(String uri)
{
- for ( Iterator<Map.Entry<String,String>> iter = uriMap.entrySet().iterator() ; iter.hasNext() ; )
+ for ( Map.Entry<String, String> e : uriMap.entrySet() )
{
- Map.Entry<String, String> e = iter.next() ;
- String k = e.getKey() ;
- if ( uri.startsWith(k) )
- return e ;
+ String k = e.getKey();
+ if ( uri.startsWith( k ) )
+ {
+ return e;
+ }
}
return null ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ModelUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ModelUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ModelUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ModelUtils.java Tue Jun 24 09:06:50 2014
@@ -129,7 +129,7 @@ public class ModelUtils
public static Iterator<Triple> statementsToTriples(final Iterator<Statement> it)
{
- return new IteratorResourceClosing<Triple>(Iter.map(it, new Transform<Statement,Triple>()
+ return new IteratorResourceClosing<>(Iter.map(it, new Transform<Statement,Triple>()
{
@Override
public Triple convert(Statement item)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeIsomorphismMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeIsomorphismMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeIsomorphismMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeIsomorphismMap.java Tue Jun 24 09:06:50 2014
@@ -27,7 +27,7 @@ import com.hp.hpl.jena.graph.Node ;
public class NodeIsomorphismMap //extends HashMap
{
- private Map<Node, Node> map = new HashMap<Node, Node>() ;
+ private Map<Node, Node> map = new HashMap<>() ;
public NodeIsomorphismMap() {}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeToLabelMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeToLabelMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeToLabelMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeToLabelMap.java Tue Jun 24 09:06:50 2014
@@ -28,7 +28,7 @@ public class NodeToLabelMap
{
// Could abstract again as a node -> label cache + cache miss handler.
int bNodeCounter = 0 ;
- Map<Node, String> bNodeStrings = new HashMap<Node, String>() ;
+ Map<Node, String> bNodeStrings = new HashMap<>() ;
boolean bNodesAsFakeURIs = false ;
String prefixString = "b" ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/NodeUtils.java Tue Jun 24 09:06:50 2014
@@ -96,13 +96,13 @@ public class NodeUtils
}} ;
ExtendedIterator<Node> eIter = WrappedIterator.create(iter) ;
- Iterator<String> conv = new MapFilterIterator<Node, String>(mapper, eIter) ;
+ Iterator<String> conv = new MapFilterIterator<>(mapper, eIter) ;
return conv ;
}
public static Set<Node> convertToNodes(Collection<String> uris)
{
- Set<Node> nodes = new HashSet<Node>() ;
+ Set<Node> nodes = new HashSet<>() ;
for ( String x : uris )
nodes.add(NodeFactory.createURI(x)) ;
return nodes ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/PrefixMapping2.java Tue Jun 24 09:06:50 2014
@@ -18,7 +18,6 @@
package com.hp.hpl.jena.sparql.util;
-import java.util.Iterator ;
import java.util.Map ;
import com.hp.hpl.jena.shared.PrefixMapping ;
@@ -185,15 +184,15 @@ public class PrefixMapping2 implements P
@Override
public PrefixMapping withDefaultMappings(PrefixMapping map)
{
- Iterator<Map.Entry<String, String>> it = map.getNsPrefixMap().entrySet().iterator();
- while (it.hasNext())
- {
- Map.Entry<String, String> e = it.next();
+ for ( Map.Entry<String, String> e : map.getNsPrefixMap().entrySet() )
+ {
String prefix = e.getKey();
String uri = e.getValue();
- if (getNsPrefixURI( prefix ) == null && getNsURIPrefix( uri ) == null)
+ if ( getNsPrefixURI( prefix ) == null && getNsURIPrefix( uri ) == null )
+ {
setNsPrefix( prefix, uri );
}
+ }
return this;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/QueryUtils.java Tue Jun 24 09:06:50 2014
@@ -63,16 +63,12 @@ public class QueryUtils
dump(op, op2) ;
throw new QueryCheckException("reparsed algebra expression does not equal query algebra") ;
}
- } catch (SSEParseException ex)
+ } catch (SSEParseException | BuildException ex)
{
System.err.println(str);
throw ex ;
} // Breakpoint
- catch (BuildException ex)
- {
- System.err.println(str);
- throw ex ;
- }
+
}
private static void dump(Op op, Op op2)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ResultSetUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ResultSetUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ResultSetUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/ResultSetUtils.java Tue Jun 24 09:06:50 2014
@@ -41,7 +41,7 @@ public class ResultSetUtils
public static List<RDFNode> resultSetToList(ResultSet rs, String selectElement)
{
// feature suggested by James Howison
- List<RDFNode> items = new ArrayList<RDFNode>() ;
+ List<RDFNode> items = new ArrayList<>() ;
while (rs.hasNext())
{
QuerySolution qs = rs.nextSolution() ;
@@ -62,7 +62,7 @@ public class ResultSetUtils
String literalOrResource)
{
// feature suggested by James Howison
- List<String> items = new ArrayList<String>() ;
+ List<String> items = new ArrayList<>() ;
while (rs.hasNext())
{
QuerySolution qs = rs.nextSolution() ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeralDatatype.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeralDatatype.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeralDatatype.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/RomanNumeralDatatype.java Tue Jun 24 09:06:50 2014
@@ -55,7 +55,7 @@ public class RomanNumeralDatatype extend
//return new RomanNumeral(lexicalForm) ;
// This means it will be the same as an integer elsewhere
- return new Integer(RomanNumeral.r2i(lexicalForm)) ;
+ return RomanNumeral.r2i( lexicalForm );
} catch (NumberFormatException ex)
{
throw new DatatypeFormatException(lexicalForm, this, ex.getMessage()) ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/TranslationTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/TranslationTable.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/TranslationTable.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/TranslationTable.java Tue Jun 24 09:06:50 2014
@@ -27,7 +27,7 @@ import java.util.Map ;
public class TranslationTable<X>
{
- Map<String, X> map = new HashMap<String, X>() ;
+ Map<String, X> map = new HashMap<>() ;
boolean ignoreCase = false ;
/** Create a translation table which respects case */
@@ -42,19 +42,22 @@ public class TranslationTable<X>
if ( name == null )
return null ;
- for ( Iterator<Map.Entry<String, X>> iter = map.entrySet().iterator() ; iter.hasNext() ; )
+ for ( Map.Entry<String, X> entry : map.entrySet() )
{
- Map.Entry<String, X> entry = iter.next() ;
- String k = entry.getKey() ;
+ String k = entry.getKey();
if ( ignoreCase )
- {
- if ( k.equalsIgnoreCase(name) )
- return entry.getValue() ;
+ {
+ if ( k.equalsIgnoreCase( name ) )
+ {
+ return entry.getValue();
+ }
}
else
{
- if ( k.equals(name) )
- return entry.getValue() ;
+ if ( k.equals( name ) )
+ {
+ return entry.getValue();
+ }
}
}
return null ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/VarUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/VarUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/VarUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/VarUtils.java Tue Jun 24 09:06:50 2014
@@ -32,7 +32,7 @@ public class VarUtils
{
public static Set<Var> getVars(Triple triple)
{
- Set<Var> x = new HashSet<Var>() ;
+ Set<Var> x = new HashSet<>() ;
addVarsFromTriple(x, triple) ;
return x ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/Version.java Tue Jun 24 09:06:50 2014
@@ -29,7 +29,7 @@ import org.apache.jena.atlas.io.Indented
/** Manage version information for subsystems */
public class Version
{
- private List<Class< ? >> classes = new ArrayList<Class< ? >>() ;
+ private List<Class< ? >> classes = new ArrayList<>() ;
/**
* Add a class to the version information
@@ -59,12 +59,11 @@ public class Version
* @param writer Writer to print version information to
*/
public void print(IndentedWriter writer)
- {
- for ( Iterator<Class<?>> iter = classes.iterator() ; iter.hasNext() ; )
+ {
+ for ( Class<?> c : classes )
{
- Class<?> c = iter.next();
- String x = Utils.classShortName(c) ;
- fields(writer, x, c) ;
+ String x = Utils.classShortName( c );
+ fields( writer, x, c );
}
}
@@ -106,8 +105,10 @@ public class Version
private static void fields(IndentedWriter writer, String prefix, Class< ? > cls)
{
- for (int i=0; i < fields.length; i++)
- printField(writer, prefix, fields[i], cls) ;
+ for ( String field : fields )
+ {
+ printField( writer, prefix, field, cls );
+ }
}
private static String field(String fieldName, Class< ? > cls)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/FindableBasicPattern.java Tue Jun 24 09:06:50 2014
@@ -42,14 +42,22 @@ class FindableBasicPattern implements Fi
if ( p == Node.ANY ) p = null ;
if ( o == Node.ANY ) o = null ;
- List<Triple> r = new ArrayList<Triple>() ;
- for ( Iterator<Triple> iter = triples.iterator() ; iter.hasNext(); )
+ List<Triple> r = new ArrayList<>() ;
+ for ( Triple t : triples )
{
- Triple t = iter.next();
- if ( s != null && ! t.getSubject().equals(s) ) continue ;
- if ( p != null && ! t.getPredicate().equals(p) ) continue ;
- if ( o != null && ! t.getObject().equals(o) ) continue ;
- r.add(t) ;
+ if ( s != null && !t.getSubject().equals( s ) )
+ {
+ continue;
+ }
+ if ( p != null && !t.getPredicate().equals( p ) )
+ {
+ continue;
+ }
+ if ( o != null && !t.getObject().equals( o ) )
+ {
+ continue;
+ }
+ r.add( t );
}
return r.iterator() ;
}
@@ -60,13 +68,21 @@ class FindableBasicPattern implements Fi
if ( s == Node.ANY ) s = null ;
if ( p == Node.ANY ) p = null ;
if ( o == Node.ANY ) o = null ;
- for ( Iterator<Triple> iter = triples.iterator() ; iter.hasNext(); )
+ for ( Triple t : triples )
{
- Triple t = iter.next();
- if ( s != null && ! t.getSubject().equals(s) ) continue ;
- if ( p != null && ! t.getPredicate().equals(p) ) continue ;
- if ( o != null && ! t.getObject().equals(o) ) continue ;
- return true ;
+ if ( s != null && !t.getSubject().equals( s ) )
+ {
+ continue;
+ }
+ if ( p != null && !t.getPredicate().equals( p ) )
+ {
+ continue;
+ }
+ if ( o != null && !t.getObject().equals( o ) )
+ {
+ continue;
+ }
+ return true;
}
return false ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphContainerUtils.java Tue Jun 24 09:06:50 2014
@@ -56,7 +56,7 @@ public class GraphContainerUtils
ExtendedIterator<Triple> iter = graph.find(container, Node.ANY, Node.ANY) ;
- SortedMap<Integer, Node> triples = new TreeMap<Integer, Node>(order) ;
+ SortedMap<Integer, Node> triples = new TreeMap<>(order) ;
try {
for ( ; iter.hasNext() ; )
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphList.java Tue Jun 24 09:06:50 2014
@@ -48,7 +48,7 @@ public class GraphList
/** Starting at a list element, find the heads of lists it is in */
public static List<Node> listFromMember(GNode gnode)
{
- List<Node> x = new ArrayList<Node>() ;
+ List<Node> x = new ArrayList<>() ;
listFromMember(gnode, x) ;
return x ;
}
@@ -77,7 +77,7 @@ public class GraphList
private static Set<GNode> findCellsWithMember(GNode gnode)
{
- Set<GNode> x = new HashSet<GNode>() ;
+ Set<GNode> x = new HashSet<>() ;
Iterator<Triple> iter = gnode.findable.find(Node.ANY, CAR, gnode.node) ;
for ( ; iter.hasNext() ; )
@@ -125,7 +125,7 @@ public class GraphList
public static Iterator<Triple> listMember(Graph graph, final Node s, Node o) {
if ( isAny(s) ) {
Set<Node> x = findAllLists(graph) ;
- IteratorConcat<Triple> iterConcat = new IteratorConcat<Triple>() ;
+ IteratorConcat<Triple> iterConcat = new IteratorConcat<>() ;
for ( Node s2 : x ) {
Iterator<Triple> iter = listMember(graph, s2, o) ;
if ( iter.hasNext() )
@@ -156,7 +156,7 @@ public class GraphList
public static List<Node> members(GNode gnode)
{
- List<Node> x = new ArrayList<Node>() ;
+ List<Node> x = new ArrayList<>() ;
members(gnode, x) ;
return x ;
}
@@ -234,7 +234,7 @@ public class GraphList
public static List<Integer> indexes(GNode gnode, Node value)
{
- List<Integer> x = new ArrayList<Integer>() ;
+ List<Integer> x = new ArrayList<>() ;
if ( ! isListNode(gnode) )
return x ;
@@ -267,7 +267,7 @@ public class GraphList
public static List<Triple> allTriples(GNode gnode)
{
- List<Triple> x = new ArrayList<Triple>() ;
+ List<Triple> x = new ArrayList<>() ;
allTriples(gnode, x) ;
return x ;
}
@@ -289,7 +289,7 @@ public class GraphList
{
// All except rdf:nil.
- Set<Node> acc = new HashSet<Node>() ;
+ Set<Node> acc = new HashSet<>() ;
// A list head is a node with a rdf:rest from it, not but rdf:rest to it.
Iterator<Triple> iter = graph.find(Node.ANY, CDR, Node.ANY) ;
try {
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphListenerBase.java Tue Jun 24 09:06:50 2014
@@ -41,8 +41,10 @@ public abstract class GraphListenerBase
@Override
public void notifyAddArray(Graph g, Triple[] triples)
{
- for ( int i = 0 ; i < triples.length ; i++ )
- addEvent(triples[i]) ;
+ for ( Triple triple : triples )
+ {
+ addEvent( triple );
+ }
// for ( Triple t : triples )
// addEvent(t) ;
}
@@ -77,8 +79,10 @@ public abstract class GraphListenerBase
@Override
public void notifyDeleteArray(Graph g, Triple[] triples)
{
- for ( int i = 0 ; i < triples.length ; i++ )
- deleteEvent(triples[i]) ;
+ for ( Triple triple : triples )
+ {
+ deleteEvent( triple );
+ }
// for ( Triple t : triples )
// deleteEvent(t) ;
}
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/util/graph/GraphUtils.java Tue Jun 24 09:06:50 2014
@@ -56,20 +56,21 @@ public class GraphUtils
public static List<String> multiValueString(Resource r, Property p)
{
List<RDFNode> nodes = multiValue(r, p) ;
- List<String> values = new ArrayList<String>() ;
-
- for ( Iterator<RDFNode> iter= nodes.iterator() ; iter.hasNext() ; )
+ List<String> values = new ArrayList<>() ;
+
+ for ( RDFNode n : nodes )
{
- RDFNode n = iter.next();
if ( n.isLiteral() )
- values.add(((Literal)n).getString()) ;
+ {
+ values.add( ( (Literal) n ).getString() );
+ }
}
return values ;
}
public static List<RDFNode> multiValue(Resource r, Property p)
{
- List<RDFNode> values = new ArrayList<RDFNode>() ;
+ List<RDFNode> values = new ArrayList<>() ;
StmtIterator sIter = r.listProperties(p) ;
while(sIter.hasNext())
{
@@ -82,13 +83,14 @@ public class GraphUtils
public static List<Resource> multiValueResource(Resource r, Property p)
{
List<RDFNode> nodes = multiValue(r, p) ;
- List<Resource> values = new ArrayList<Resource>() ;
-
- for ( Iterator<RDFNode> iter= nodes.iterator() ; iter.hasNext() ; )
+ List<Resource> values = new ArrayList<>() ;
+
+ for ( RDFNode n : nodes )
{
- RDFNode n = iter.next();
if ( n.isResource() )
- values.add((Resource)n) ;
+ {
+ values.add( (Resource) n );
+ }
}
return values ;
}
@@ -96,13 +98,14 @@ public class GraphUtils
public static List<String> multiValueURI(Resource r, Property p)
{
List<RDFNode> nodes = multiValue(r, p) ;
- List<String> values = new ArrayList<String>() ;
-
- for ( Iterator<RDFNode> iter= nodes.iterator() ; iter.hasNext() ; )
+ List<String> values = new ArrayList<>() ;
+
+ for ( RDFNode n : nodes )
{
- RDFNode n = iter.next();
if ( n.isURIResource() )
- values.add(((Resource)n).getURI()) ;
+ {
+ values.add( ( (Resource) n ).getURI() );
+ }
}
return values ;
}
@@ -199,7 +202,7 @@ public class GraphUtils
/** All subjects and objects, no duplicates. */
public static Iterator<Node> allNodes(Graph graph)
{
- Set<Node> x = new HashSet<Node>(1000) ;
+ Set<Node> x = new HashSet<>(1000) ;
ExtendedIterator<Triple> iter = graph.find(Node.ANY, Node.ANY, Node.ANY) ;
for ( ; iter.hasNext() ; )
{
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/update/UpdateRequest.java Tue Jun 24 09:06:50 2014
@@ -36,7 +36,7 @@ import com.hp.hpl.jena.sparql.modify.req
*/
public class UpdateRequest extends Prologue implements Printable, Iterable<Update>
{
- private List<Update> operations = new ArrayList<Update>() ;
+ private List<Update> operations = new ArrayList<>() ;
private List<Update> operationsView = Collections.unmodifiableList(operations) ;
public UpdateRequest() { super() ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/csv/CSVParser.java Tue Jun 24 09:06:50 2014
@@ -55,7 +55,7 @@ public class CSVParser implements Iterab
public CSVParser(CSVTokenIterator iter) {
this.iter = iter ;
- this.pIter = new PeekIterator<CSVToken>(iter) ;
+ this.pIter = new PeekIterator<>(iter) ;
}
@Override
@@ -74,7 +74,7 @@ public class CSVParser implements Iterab
public List<String> parse1() {
// Get rid of switches. break problems.
- List<String> line = new ArrayList<String>(100) ;
+ List<String> line = new ArrayList<>(100) ;
loop: while (pIter.hasNext()) {
CSVToken t = pIter.next() ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/AbstractDataBag.java Tue Jun 24 09:06:50 2014
@@ -42,10 +42,10 @@ import org.apache.jena.atlas.lib.FileOps
*/
public abstract class AbstractDataBag<E> implements DataBag<E>
{
- private final List<File> spillFiles = new ArrayList<File>();
- protected Collection<E> memory = new ArrayList<E>();
+ private final List<File> spillFiles = new ArrayList<>();
+ protected Collection<E> memory = new ArrayList<>();
- private final List<WeakReference<Closeable>> closeableIterators = new ArrayList<WeakReference<Closeable>>();
+ private final List<WeakReference<Closeable>> closeableIterators = new ArrayList<>();
// Total size, including tuples on disk.
protected long size = 0;
@@ -135,7 +135,7 @@ public abstract class AbstractDataBag<E>
*/
protected void registerCloseableIterator(Closeable c)
{
- closeableIterators.add(new WeakReference<Closeable>(c)) ;
+ closeableIterators.add(new WeakReference<>(c)) ;
}
/**
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/BagFactory.java Tue Jun 24 09:06:50 2014
@@ -31,7 +31,7 @@ public class BagFactory
*/
public static <T> DefaultDataBag<T> newDefaultBag(ThresholdPolicy<T> policy, SerializationFactory<T> serializerFactory)
{
- return new DefaultDataBag<T>(policy, serializerFactory);
+ return new DefaultDataBag<>(policy, serializerFactory);
}
/**
@@ -47,7 +47,7 @@ public class BagFactory
*/
public static <T> SortedDataBag<T> newSortedBag(ThresholdPolicy<T> policy, SerializationFactory<T> serializerFactory, Comparator<T> comparator)
{
- return new SortedDataBag<T>(policy, serializerFactory, comparator);
+ return new SortedDataBag<>(policy, serializerFactory, comparator);
}
/**
@@ -63,7 +63,7 @@ public class BagFactory
*/
public static <T> DistinctDataBag<T> newDistinctBag(ThresholdPolicy<T> policy, SerializationFactory<T> serializerFactory, Comparator<T> comparator)
{
- return new DistinctDataBag<T>(policy, serializerFactory, comparator);
+ return new DistinctDataBag<>(policy, serializerFactory, comparator);
}
/**
@@ -79,6 +79,6 @@ public class BagFactory
*/
public static <T> DistinctDataNet<T> newDistinctNet(ThresholdPolicy<T> policy, SerializationFactory<T> serializerFactory, Comparator<T> comparator)
{
- return new DistinctDataNet<T>(policy, serializerFactory, comparator);
+ return new DistinctDataNet<>(policy, serializerFactory, comparator);
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DefaultDataBag.java Tue Jun 24 09:06:50 2014
@@ -173,7 +173,7 @@ public class DefaultDataBag<E> extends A
throw new AtlasException(ex) ;
}
Iterator<E> deserializer = serializationFactory.createDeserializer(in) ;
- IteratorResourceClosing<E> irc = new IteratorResourceClosing<E>(deserializer, in) ;
+ IteratorResourceClosing<E> irc = new IteratorResourceClosing<>(deserializer, in) ;
registerCloseableIterator(irc);
toReturn = irc;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataBag.java Tue Jun 24 09:06:50 2014
@@ -54,7 +54,7 @@ public class DistinctDataBag<E> extends
public DistinctDataBag(ThresholdPolicy<E> policy, SerializationFactory<E> serializerFactory, Comparator<E> comparator)
{
super(policy, serializerFactory, comparator);
- this.memory = new HashSet<E>();
+ this.memory = new HashSet<>();
}
@Override
@@ -91,7 +91,7 @@ public class DistinctDataBag<E> extends
}
else
{
- return new DistinctReducedIterator<E>(super.iterator());
+ return new DistinctReducedIterator<>(super.iterator());
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/DistinctDataNet.java Tue Jun 24 09:06:50 2014
@@ -88,7 +88,7 @@ public class DistinctDataNet<E> extends
@Override
protected List<File> getSpillFiles()
{
- List<File> toReturn = new ArrayList<File>(super.getSpillFiles());
+ List<File> toReturn = new ArrayList<>(super.getSpillFiles());
if (null != firstSpillFile)
{
toReturn.add(firstSpillFile);
@@ -182,7 +182,7 @@ public class DistinctDataNet<E> extends
*/
public static <S> SortedDiffIterator<S> create(Iterator<S> first, Iterator<S> second, Comparator<? super S> comparator)
{
- return new SortedDiffIterator<S>(first, second, comparator);
+ return new SortedDiffIterator<>(first, second, comparator);
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java Tue Jun 24 09:06:50 2014
@@ -171,7 +171,7 @@ public class SortedDataBag<E> extends Ab
{
InputStream in = getInputStream(spillFile);
Iterator<E> deserializer = serializationFactory.createDeserializer(in) ;
- return new IteratorResourceClosing<E>(deserializer, in);
+ return new IteratorResourceClosing<>(deserializer, in);
}
/**
@@ -209,7 +209,7 @@ public class SortedDataBag<E> extends Ab
if (spilled)
{
- List<Iterator<E>> inputs = new ArrayList<Iterator<E>>(size + (memSize > 0 ? 1 : 0));
+ List<Iterator<E>> inputs = new ArrayList<>(size + (memSize > 0 ? 1 : 0));
if (memSize > 0)
{
@@ -236,7 +236,7 @@ public class SortedDataBag<E> extends Ab
}
}
- SpillSortIterator<E> ssi = new SpillSortIterator<E>(inputs, comparator);
+ SpillSortIterator<E> ssi = new SpillSortIterator<>(inputs, comparator);
registerCloseableIterator(ssi);
return ssi;
@@ -280,7 +280,7 @@ public class SortedDataBag<E> extends Ab
sink.close() ;
}
- List<File> toRemove = new ArrayList<File>(MAX_SPILL_FILES) ;
+ List<File> toRemove = new ArrayList<>(MAX_SPILL_FILES) ;
for (int i = 0; i < MAX_SPILL_FILES; i++)
{
File file = getSpillFiles().get(i) ;
@@ -290,7 +290,7 @@ public class SortedDataBag<E> extends Ab
getSpillFiles().removeAll(toRemove) ;
- memory = new ArrayList<E>() ;
+ memory = new ArrayList<>() ;
}
}
catch (IOException e)
@@ -325,7 +325,7 @@ public class SortedDataBag<E> extends Ab
{
this.inputs = inputs;
this.comp = comp;
- this.minHeap = new PriorityQueue<Item<T>>(inputs.size());
+ this.minHeap = new PriorityQueue<>(inputs.size());
// Prime the heap
for (int i=0; i<inputs.size(); i++)
@@ -340,7 +340,7 @@ public class SortedDataBag<E> extends Ab
if (it.hasNext())
{
T tuple = it.next();
- minHeap.add(new Item<T>(index, tuple, comp));
+ minHeap.add(new Item<>(index, tuple, comp));
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/data/ThresholdPolicyFactory.java Tue Jun 24 09:06:50 2014
@@ -61,7 +61,7 @@ public class ThresholdPolicyFactory
*/
public static <E> ThresholdPolicy<E> count(long threshold)
{
- return new ThresholdPolicyCount<E>(threshold) ;
+ return new ThresholdPolicyCount<>(threshold) ;
}
/**
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/event/EventManager.java Tue Jun 24 09:06:50 2014
@@ -49,8 +49,8 @@ public class EventManager
// There are 2 event sets: one for specific objects and one for general event types (no object)
// MultipMap.MultiMapToList
- private Map<Object, Map<EventType, List<EventListener>>> listenersByObject = new HashMap<Object, Map<EventType, List<EventListener>>>() ;
- private Map<EventType, List<EventListener>> listenersAllObjects = new HashMap<EventType, List<EventListener>>() ;
+ private Map<Object, Map<EventType, List<EventListener>>> listenersByObject = new HashMap<>() ;
+ private Map<EventType, List<EventListener>> listenersAllObjects = new HashMap<>() ;
// Singleton above.
private EventManager () {}
@@ -61,14 +61,14 @@ public class EventManager
if ( x == null )
{
// Because listeners2 is never null.
- x = new HashMap<EventType, List<EventListener>> () ;
+ x = new HashMap<>() ;
listenersByObject.put(object, x) ;
}
List<EventListener> z = x.get(type) ;
if ( z == null )
{
//?? new CopyOnWriteArrayList<EventListener>() ;
- z = new ArrayList<EventListener>() ;
+ z = new ArrayList<>() ;
x.put(type, z) ;
}
z.add(listener) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java Tue Jun 24 09:06:50 2014
@@ -119,8 +119,10 @@ public class IndentedWriter extends AWri
@Override
public void print(char[] cbuf)
{
- for ( int i = 0 ; i < cbuf.length ; i++ )
- printOneChar(cbuf[i]) ;
+ for ( char aCbuf : cbuf )
+ {
+ printOneChar( aCbuf );
+ }
}
/** Print a string N times */
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/FilterUnique.java Tue Jun 24 09:06:50 2014
@@ -23,7 +23,7 @@ import java.util.Set ;
public class FilterUnique<T> implements Filter<T>
{
- private Set<T> seen = new HashSet<T>() ;
+ private Set<T> seen = new HashSet<>() ;
public FilterUnique() { }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/Iter.java Tue Jun 24 09:06:50 2014
@@ -30,7 +30,7 @@ public class Iter<T> implements Iterable
// Often with both Iterator<? extends T> and Iterable<? extends T>
public static <T> Iterator<T> singleton(T item) {
- return new SingletonIterator<T>(item) ;
+ return new SingletonIterator<>(item) ;
}
@SuppressWarnings("rawtypes")
@@ -62,7 +62,7 @@ public class Iter<T> implements Iterable
@Override
public void start() {
- acc = new HashSet<T>() ;
+ acc = new HashSet<>() ;
}
@Override
@@ -91,7 +91,7 @@ public class Iter<T> implements Iterable
@Override
public void start() {
- acc = new ArrayList<T>() ;
+ acc = new ArrayList<>() ;
}
@Override
@@ -232,7 +232,7 @@ public class Iter<T> implements Iterable
private static class InvertedFilter<T> implements Filter<T> {
public static <T> Filter<T> invert(Filter<T> filter) {
- return new InvertedFilter<T>(filter) ;
+ return new InvertedFilter<>(filter) ;
}
private Filter<T> baseFilter ;
@@ -484,8 +484,8 @@ public class Iter<T> implements Iterable
/** Take the first N elements of an iterator - stop early if too few */
public static <T> List<T> take(Iterator<T> iter, int N) {
- iter = new IteratorN<T>(iter, N) ;
- List<T> x = new ArrayList<T>(N) ;
+ iter = new IteratorN<>(iter, N) ;
+ List<T> x = new ArrayList<>(N) ;
for (; iter.hasNext();)
x.add(iter.next()) ;
return x ;
@@ -694,21 +694,21 @@ public class Iter<T> implements Iterable
public static <T> Iter<T> iter(Iterator<T> iterator) {
if ( iterator instanceof Iter<? > )
return (Iter<T>)iterator ;
- return new Iter<T>(iterator) ;
+ return new Iter<>(iterator) ;
}
public static <T> Iter<T> iter(Iterable<T> iterable) {
if ( iterable instanceof Iter<? > )
return (Iter<T>)iterable ;
- return new Iter<T>(iterable.iterator()) ;
+ return new Iter<>(iterable.iterator()) ;
}
public static <T> Iter<T> singletonIter(T item) {
- return new Iter<T>(new SingletonIterator<T>(item)) ;
+ return new Iter<>(new SingletonIterator<>(item)) ;
}
public static <T> Iter<T> nullIter() {
- return new Iter<T>(new NullIterator<T>()) ;
+ return new Iter<>(new NullIterator<T>()) ;
}
/**
@@ -864,7 +864,7 @@ public class Iter<T> implements Iterable
}
public Iter<T> append(Iterator<T> iter) {
- return new Iter<T>(IteratorCons.create(iterator, iter)) ;
+ return new Iter<>(IteratorCons.create(iterator, iter)) ;
}
/** Return an Iter that yields at most the first N items */
@@ -874,7 +874,7 @@ public class Iter<T> implements Iterable
/** Count the iterator (this is destructive on the iterator) */
public long count() {
- ActionCount<T> action = new ActionCount<T>() ;
+ ActionCount<T> action = new ActionCount<>() ;
apply(action) ;
return action.getCount() ;
}
@@ -888,11 +888,11 @@ public class Iter<T> implements Iterable
}
public Iter<T> distinct() {
- return new Iter<T>(distinct(iterator())) ;
+ return new Iter<>(distinct(iterator())) ;
}
public Iter<T> distinctAdjacent() {
- return new Iter<T>(distinctAdjacent(iterator())) ;
+ return new Iter<>(distinctAdjacent(iterator())) ;
}
// ---- Iterable
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java Tue Jun 24 09:06:50 2014
@@ -26,11 +26,11 @@ public final class IteratorArray<T> impl
{
/** Iterator over all the array elements */
public static <T> IteratorArray<T> create(T[] array)
- { return new IteratorArray<T>(array, 0, array.length) ; }
+ { return new IteratorArray<>(array, 0, array.length) ; }
/** Iterator over array elements from start (inclusive) to finish (exclusive) */
public static <T> IteratorArray<T> create(T[] array, int start, int finish)
- { return new IteratorArray<T>(array, start, finish) ; }
+ { return new IteratorArray<>(array, start, finish) ; }
private int idx ;
private int finishIdx ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java Tue Jun 24 09:06:50 2014
@@ -42,7 +42,7 @@ public class IteratorConcat<T> implement
{
if (iter2 == null) return iter1 ;
if (iter1 == null) return iter2 ;
- IteratorConcat<T> c = new IteratorConcat<T>() ;
+ IteratorConcat<T> c = new IteratorConcat<>() ;
c.add(iter1) ;
c.add(iter2) ;
return c ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorCons.java Tue Jun 24 09:06:50 2014
@@ -53,7 +53,7 @@ public class IteratorCons<T> implements
return x ;
}
- return new IteratorCons<X>(iter1, iter2) ;
+ return new IteratorCons<>(iter1, iter2) ;
}
private IteratorCons(Iterator<? extends T> iter1, Iterator<? extends T> iter2)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorInteger.java Tue Jun 24 09:06:50 2014
@@ -49,7 +49,7 @@ public class IteratorInteger implements
@Override
public Long next()
{
- Long v = Long.valueOf(current) ;
+ Long v = current;
current++ ;
return v ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithBuffer.java Tue Jun 24 09:06:50 2014
@@ -43,7 +43,7 @@ public class IteratorWithBuffer<T> imple
if ( N < 0 )
throw new IllegalArgumentException("Buffering size < 0") ;
this.iter = iter ;
- this.lookahead = new ArrayList<T>(N) ;
+ this.lookahead = new ArrayList<>(N) ;
this.capacity = N ;
// Fill the lookahead.
for ( int i = 0 ; i < N ; i++ )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/IteratorWithHistory.java Tue Jun 24 09:06:50 2014
@@ -39,7 +39,7 @@ public class IteratorWithHistory<T> impl
public IteratorWithHistory(Iterator<T> iter, int N)
{
this.iter = iter ;
- this.history = new ArrayList<T>(N) ;
+ this.history = new ArrayList<>(N) ;
this.capacity = N ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PeekIterator.java Tue Jun 24 09:06:50 2014
@@ -35,7 +35,7 @@ public class PeekIterator<T> implements
{
if ( iter instanceof PeekIterator<?> )
return (PeekIterator<T>)iter ;
- return new PeekIterator<T>(iter) ;
+ return new PeekIterator<>(iter) ;
}
public PeekIterator(Iterator<T> iter)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/PushbackIterator.java Tue Jun 24 09:06:50 2014
@@ -24,7 +24,7 @@ import java.util.Iterator ;
public class PushbackIterator<T> implements Iterator<T>
{
- private Deque<T> items = new ArrayDeque<T>() ;
+ private Deque<T> items = new ArrayDeque<>() ;
private Iterator<T> iter ;
public PushbackIterator(Iterator <T> iter)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/iterator/SingletonIterator.java Tue Jun 24 09:06:50 2014
@@ -26,7 +26,7 @@ public class SingletonIterator<T> implem
private T thing = null ;
private boolean yielded = false ;
- public static <T> SingletonIterator<T> create(T thing) { return new SingletonIterator<T>(thing) ; }
+ public static <T> SingletonIterator<T> create(T thing) { return new SingletonIterator<>(thing) ; }
public SingletonIterator(T thing) { this.thing = thing ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JSON.java Tue Jun 24 09:06:50 2014
@@ -63,8 +63,10 @@ public class JSON
{
try
{
- InputStream in = IO.openFileEx(filename) ;
- try { return JSON.parse(in) ; } finally { in.close() ; }
+ try (InputStream in = IO.openFileEx( filename ))
+ {
+ return JSON.parse( in );
+ }
}
catch (FileNotFoundException ex)
{
@@ -82,8 +84,10 @@ public class JSON
{
try
{
- InputStream in = IO.openFileEx(filename) ;
- try { return JSON.parseAny(in) ; } finally { in.close() ; }
+ try (InputStream in = IO.openFileEx( filename ))
+ {
+ return JSON.parseAny( in );
+ }
}
catch (FileNotFoundException ex)
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonAccess.java Tue Jun 24 09:06:50 2014
@@ -25,32 +25,36 @@ public class JsonAccess
{
public static JsonValue accessPath(JsonValue obj, String ... path)
{
- for ( int i = 0 ; i < path.length ; i++ )
+ for ( String p : path )
{
- String p = path[i] ;
- if ( ! obj.isObject() )
- throw new JsonException("Path traverses non-object") ;
- obj = obj.getAsObject().get(p) ;
+ if ( !obj.isObject() )
+ {
+ throw new JsonException( "Path traverses non-object" );
+ }
+ obj = obj.getAsObject().get( p );
}
return obj ;
}
public static JsonValue access(JsonValue obj, Object ... path)
{
- for ( int i = 0 ; i < path.length ; i++ )
+ for ( Object p : path )
{
- Object p = path[i] ;
if ( p instanceof String )
{
- if ( ! obj.isObject() )
- throw new JsonException("Path traverses non-object") ;
- obj = obj.getAsObject().get((String)p) ;
+ if ( !obj.isObject() )
+ {
+ throw new JsonException( "Path traverses non-object" );
+ }
+ obj = obj.getAsObject().get( (String) p );
}
if ( p instanceof Integer )
{
- if ( ! obj.isArray() )
- throw new JsonException("Path traverses non-array") ;
- obj = obj.getAsArray().get((Integer)p) ;
+ if ( !obj.isArray() )
+ {
+ throw new JsonException( "Path traverses non-array" );
+ }
+ obj = obj.getAsArray().get( (Integer) p );
}
}
return obj ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java Tue Jun 24 09:06:50 2014
@@ -26,7 +26,7 @@ import java.util.ListIterator ;
public class JsonArray extends JsonValue implements List<JsonValue>, Iterable<JsonValue>
{
- private List<JsonValue> array = new ArrayList<JsonValue>() ;
+ private List<JsonValue> array = new ArrayList<>() ;
@Override
public boolean isArray() { return true ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonBuilder.java Tue Jun 24 09:06:50 2014
@@ -33,17 +33,17 @@ public class JsonBuilder {
// If not an array or object.
private JsonValue builtValue = null ;
private static final String NoMarker = "" ;
- private Deque<String> markers = new ArrayDeque<String>() ;
- private Deque<JsonArray> arrays = new ArrayDeque<JsonArray>() ;
- private Deque<JsonObject> objects = new ArrayDeque<JsonObject>() ;
+ private Deque<String> markers = new ArrayDeque<>() ;
+ private Deque<JsonArray> arrays = new ArrayDeque<>() ;
+ private Deque<JsonObject> objects = new ArrayDeque<>() ;
private static enum State {
ARRAY, OBJECT
}
- private Deque<State> stack = new ArrayDeque<State>() ;
+ private Deque<State> stack = new ArrayDeque<>() ;
// The depth of this stack is the object depth. key: { key: ... }
- private Deque<String> keys = new ArrayDeque<String>() ;
+ private Deque<String> keys = new ArrayDeque<>() ;
public JsonBuilder() {
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonObject.java Tue Jun 24 09:06:50 2014
@@ -26,7 +26,7 @@ import java.util.Map.Entry ;
public class JsonObject extends JsonValue //implements Map<String, JsonValue>
{
- private final Map<String, JsonValue> map = new HashMap<String, JsonValue>() ;
+ private final Map<String, JsonValue> map = new HashMap<>() ;
@Override
public boolean isObject() { return true ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSONMaker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSONMaker.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSONMaker.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSONMaker.java Tue Jun 24 09:06:50 2014
@@ -33,11 +33,11 @@ public class JSONMaker implements JSONHa
private JsonValue value = null ;
- private Deque<JsonArray> arrays = new ArrayDeque<JsonArray>();
- private Deque<JsonObject> objects = new ArrayDeque<JsonObject>();
+ private Deque<JsonArray> arrays = new ArrayDeque<>();
+ private Deque<JsonObject> objects = new ArrayDeque<>();
// The depth of this stack is the object depth.
- private Deque<String> keys = new ArrayDeque<String>();
+ private Deque<String> keys = new ArrayDeque<>();
public JsonValue jsonValue()
{
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSWriter.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JSWriter.java Tue Jun 24 09:06:50 2014
@@ -69,7 +69,7 @@ public class JSWriter {
// Remember whether we are in the first element of a compound
// (object or array).
- Deque<Ref<Boolean>> stack = new ArrayDeque<Ref<Boolean>>() ;
+ Deque<Ref<Boolean>> stack = new ArrayDeque<>() ;
public void startObject() {
startCompound() ;
@@ -277,7 +277,7 @@ public class JSWriter {
}
private void startCompound() {
- stack.push(new Ref<Boolean>(true)) ;
+ stack.push(new Ref<>(true)) ;
}
private void finishCompound() {
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java Tue Jun 24 09:06:50 2014
@@ -87,7 +87,7 @@ public class JsonWriter implements JsonV
return true ;
}
private void writeObjectCompact(JsonObject jsonObject, Set<String> x) {
- SortedSet<String> y = new TreeSet<String>(x) ;
+ SortedSet<String> y = new TreeSet<>(x) ;
boolean first = true ;
for ( String k : y ) {
if ( ! first )
@@ -105,7 +105,7 @@ public class JsonWriter implements JsonV
private void writeObjectLong(JsonObject jsonObject, Set<String> x) {
// Just after the opening {
- SortedSet<String> y = new TreeSet<String>(x) ;
+ SortedSet<String> y = new TreeSet<>(x) ;
boolean first = true ;
out.println() ;
for ( String k : y ) {
@@ -163,9 +163,12 @@ public class JsonWriter implements JsonV
private boolean isJsonArrayCompact(JsonArray jsonArray) {
if ( jsonArray.size() > maxCompactArray ) return false ;
- for ( int i = 0 ; i < jsonArray.size() ; i++ ) {
- if ( ! jsonArray.get(i).isPrimitive() )
- return false ;
+ for ( JsonValue aJsonArray : jsonArray )
+ {
+ if ( !aJsonArray.isPrimitive() )
+ {
+ return false;
+ }
}
return true ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/JSONParserBase.java Tue Jun 24 09:06:50 2014
@@ -37,7 +37,7 @@ class JSONParserBase
protected JSONParserBase(Tokenizer tokens)
{
this.tokens = tokens ;
- peekTokens = new PeekIterator<Token>(tokens) ;
+ peekTokens = new PeekIterator<>(tokens) ;
}
private Token tokenEOF = null ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/ParseException.java Tue Jun 24 09:06:50 2014
@@ -106,20 +106,24 @@ public class ParseException extends Exce
int[][] expectedTokenSequences,
String[] tokenImage) {
String eol = System.getProperty("line.separator", "\n");
- StringBuffer expected = new StringBuffer();
+ StringBuilder expected = new StringBuilder();
int maxSize = 0;
- for (int i = 0; i < expectedTokenSequences.length; i++) {
- if (maxSize < expectedTokenSequences[i].length) {
- maxSize = expectedTokenSequences[i].length;
+ for ( int[] expectedTokenSequence : expectedTokenSequences )
+ {
+ if ( maxSize < expectedTokenSequence.length )
+ {
+ maxSize = expectedTokenSequence.length;
+ }
+ for ( int anExpectedTokenSequence : expectedTokenSequence )
+ {
+ expected.append( tokenImage[anExpectedTokenSequence] ).append( ' ' );
+ }
+ if ( expectedTokenSequence[expectedTokenSequence.length - 1] != 0 )
+ {
+ expected.append( "..." );
+ }
+ expected.append( eol ).append( " " );
}
- for (int j = 0; j < expectedTokenSequences[i].length; j++) {
- expected.append(tokenImage[expectedTokenSequences[i][j]]).append(' ');
- }
- if (expectedTokenSequences[i][expectedTokenSequences[i].length - 1] != 0) {
- expected.append("...");
- }
- expected.append(eol).append(" ");
- }
String retval = "Encountered \"";
Token tok = currentToken.next;
for (int i = 0; i < maxSize; i++) {
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parserjavacc/javacc/TokenMgrError.java Tue Jun 24 09:06:50 2014
@@ -65,7 +65,7 @@ public class TokenMgrError extends Error
* equivalents in the given string
*/
protected static final String addEscapes(String str) {
- StringBuffer retval = new StringBuffer();
+ StringBuilder retval = new StringBuilder();
char ch;
for (int i = 0; i < str.length(); i++) {
switch (str.charAt(i))
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java Tue Jun 24 09:06:50 2014
@@ -37,7 +37,7 @@ public class CacheFactory
*/
public static <Key, Value> Cache<Key, Value> createCache(float loadFactor, int maxSize)
{
- return new CacheLRU<Key, Value>(loadFactor, maxSize) ;
+ return new CacheLRU<>(loadFactor, maxSize) ;
}
/** Create a cache which has space for upto a certain number of objects.
@@ -52,32 +52,32 @@ public class CacheFactory
/** Create a null cache */
public static <Key, Value> Cache<Key, Value> createNullCache()
{
- return new Cache0<Key, Value>() ;
+ return new Cache0<>() ;
}
/** Create a cache which has unbounded space */
public static <Key, Value> Cache<Key, Value> createCacheUnbounded()
{
- return new CacheUnbounded<Key, Value>() ;
+ return new CacheUnbounded<>() ;
}
/* Add a getter wrapper to an existing cache */
public static <Key, Value> Cache<Key, Value> createCacheWithGetter(Cache<Key, Value> cache, Getter<Key, Value> getter)
{
- return new CacheWithGetter<Key, Value>(cache, getter) ;
+ return new CacheWithGetter<>(cache, getter) ;
}
/** Create a lightweight cache (e.g. slot replacement) */
public static <Key, Value> Cache<Key, Value> createSimpleCache(int size)
{
- return new CacheSimple<Key, Value>(size) ;
+ return new CacheSimple<>(size) ;
}
/** One slot cache */
public static <Key, Value> Cache<Key, Value> createOneSlotCache()
{
- return new Cache1<Key, Value>() ;
+ return new Cache1<>() ;
}
/** Add a statistics wrapper to an existing cache */
@@ -85,7 +85,7 @@ public class CacheFactory
{
if ( cache instanceof CacheStats<?,?>)
return (CacheStats<Key, Value>) cache ;
- return new CacheStatsAtomic<Key, Value>(cache) ;
+ return new CacheStatsAtomic<>(cache) ;
}
/** Create set-cache, rather than a map-cache.
@@ -93,7 +93,7 @@ public class CacheFactory
*/
public static <Obj> CacheSet<Obj> createCacheSet(int size)
{
- return new CacheSetLRU<Obj>(size) ;
+ return new CacheSetLRU<>(size) ;
}
/** Add a synchronization wrapper to an existing set-cache */
@@ -101,7 +101,7 @@ public class CacheFactory
{
if ( cache instanceof CacheSetSync<?>)
return cache ;
- return new CacheSetSync<Obj>(cache) ;
+ return new CacheSetSync<>(cache) ;
}
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Cell.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Cell.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Cell.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Cell.java Tue Jun 24 09:06:50 2014
@@ -40,7 +40,7 @@ public class Cell<K,V>
public Cell<K,V> extend(K key, V value)
{
- return new Cell<K,V>(key, value, this) ;
+ return new Cell<>(key, value, this) ;
}
public final V find(K k)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/DS.java Tue Jun 24 09:06:50 2014
@@ -27,19 +27,19 @@ public class DS
public static <X> Set<X> setOfNone() { return Collections.emptySet() ; }
public static <X> Set<X> setOfOne(X element) { return Collections.singleton(element) ; }
- public static <X> Set<X> set() { return new HashSet<X>(); }
- public static <X> Set<X> set(int initialSize) { return new HashSet<X>(initialSize); }
- public static <X> Set<X> set(Set<X> other) { return new HashSet<X>(other); }
+ public static <X> Set<X> set() { return new HashSet<>(); }
+ public static <X> Set<X> set(int initialSize) { return new HashSet<>(initialSize); }
+ public static <X> Set<X> set(Set<X> other) { return new HashSet<>(other); }
public static <K, V> Map<K,V> mapOfNone() { return Collections.emptyMap() ; }
public static <K, V> Map<K,V> mapOfOne(K key, V value) { return Collections.singletonMap(key, value) ; }
- public static <K, V> Map<K,V> map() { return new HashMap<K,V>(); }
- public static <K, V> Map<K,V> map(int initialSize) { return new HashMap<K,V>(initialSize); }
- public static <K, V> Map<K,V> map(Map<K,V> other) { return new HashMap<K,V>(other); }
+ public static <K, V> Map<K,V> map() { return new HashMap<>(); }
+ public static <K, V> Map<K,V> map(int initialSize) { return new HashMap<>(initialSize); }
+ public static <K, V> Map<K,V> map(Map<K,V> other) { return new HashMap<>(other); }
public static <T> List<T> listOfNone() { return Collections.emptyList() ; }
public static <T> List<T> listOfOne(T element) { return Collections.singletonList(element) ; }
- public static <T> List<T> list() { return new ArrayList<T>(); }
- public static <T> List<T> list(int initialSize) { return new ArrayList<T>(initialSize); }
- public static <T> List<T> list(List<T> other) { return new ArrayList<T>(other); }
+ public static <T> List<T> list() { return new ArrayList<>(); }
+ public static <T> List<T> list(int initialSize) { return new ArrayList<>(initialSize); }
+ public static <T> List<T> list(List<T> other) { return new ArrayList<>(other); }
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/ListUtils.java Tue Jun 24 09:06:50 2014
@@ -43,7 +43,7 @@ public class ListUtils
public static
List<Integer> asList(int... values)
{
- List<Integer> x = new ArrayList<Integer>() ;
+ List<Integer> x = new ArrayList<>() ;
for ( int v : values )
x.add(v) ;
return x ;
@@ -54,11 +54,11 @@ public class ListUtils
StringBuilder buff = new StringBuilder() ;
String sep = "[" ;
- for ( int i = 0 ; i < array.length ; i++ )
+ for ( T anArray : array )
{
- buff.append(sep) ;
- sep = ", " ;
- buff.append(array[i]) ;
+ buff.append( sep );
+ sep = ", ";
+ buff.append( anArray );
}
buff.append("]") ;
return buff.toString() ;
@@ -69,11 +69,11 @@ public class ListUtils
StringBuilder buff = new StringBuilder() ;
String sep = "[" ;
- for ( int i = 0 ; i < array.length ; i++ )
+ for ( int anArray : array )
{
- buff.append(sep) ;
- sep = ", " ;
- buff.append(array[i]) ;
+ buff.append( sep );
+ sep = ", ";
+ buff.append( anArray );
}
buff.append("]") ;
return buff.toString() ;
@@ -84,11 +84,11 @@ public class ListUtils
StringBuilder buff = new StringBuilder() ;
String sep = "[" ;
- for ( int i = 0 ; i < array.length ; i++ )
+ for ( long anArray : array )
{
- buff.append(sep) ;
- sep = ", " ;
- buff.append(array[i]) ;
+ buff.append( sep );
+ sep = ", ";
+ buff.append( anArray );
}
buff.append("]") ;
return buff.toString() ;
@@ -125,7 +125,7 @@ public class ListUtils
return null ;
}
- List<List<T>> x = new ArrayList<List<T>>() ;
+ List<List<T>> x = new ArrayList<>() ;
if ( c.size() == 1 )
{
x.add(c) ;
@@ -134,7 +134,7 @@ public class ListUtils
for ( T obj : c )
{
- List<T> c2 = new ArrayList<T>(c) ;
+ List<T> c2 = new ArrayList<>(c) ;
c2.remove(obj) ;
List<List<T>> x2 = permute(c2) ;
// For each list returned
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java Tue Jun 24 09:06:50 2014
@@ -26,12 +26,12 @@ import org.apache.jena.atlas.iterator.It
public abstract class MultiMap<K, V>
{
- private Map<K, Collection<V>> map = new HashMap<K, Collection<V>>() ;
+ private Map<K, Collection<V>> map = new HashMap<>() ;
protected abstract Collection<V> createCollection() ;
- public static <K, V> MultiMapToList<K, V> createMapList() { return new MultiMapToList<K, V>() ; }
- public static <K, V> MultiMapToSet<K, V> createMapSet() { return new MultiMapToSet<K, V>() ; }
+ public static <K, V> MultiMapToList<K, V> createMapList() { return new MultiMapToList<>() ; }
+ public static <K, V> MultiMapToSet<K, V> createMapSet() { return new MultiMapToSet<>() ; }
protected MultiMap() { }
@@ -83,7 +83,7 @@ public abstract class MultiMap<K, V>
/** Does not materialise the contents */
public Iterator<V> flatten()
{
- IteratorConcat<V> all = new IteratorConcat<V>() ;
+ IteratorConcat<V> all = new IteratorConcat<>() ;
for ( K k : map.keySet() )
{
Collection<V> x = map.get(k) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToList.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToList.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToList.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToList.java Tue Jun 24 09:06:50 2014
@@ -25,11 +25,11 @@ import java.util.List ;
import org.apache.jena.atlas.iterator.Iter ;
public class MultiMapToList<K,V> extends MultiMap<K,V> {
- public static <K, V> MultiMapToList<K, V> create() { return new MultiMapToList<K, V>() ; }
+ public static <K, V> MultiMapToList<K, V> create() { return new MultiMapToList<>() ; }
@Override
protected Collection<V> createCollection() {
- return new ArrayList<V>() ;
+ return new ArrayList<>() ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToSet.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToSet.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMapToSet.java Tue Jun 24 09:06:50 2014
@@ -25,12 +25,12 @@ import java.util.Set ;
import org.apache.jena.atlas.iterator.Iter ;
public class MultiMapToSet<K,V> extends MultiMap<K,V> {
- public static <K, V> MultiMapToSet<K, V> create() { return new MultiMapToSet<K, V>() ; }
+ public static <K, V> MultiMapToSet<K, V> create() { return new MultiMapToSet<>() ; }
@Override
protected Collection<V> createCollection()
{
- return new HashSet<V>() ;
+ return new HashSet<>() ;
}
@Override
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiSet.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiSet.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiSet.java Tue Jun 24 09:06:50 2014
@@ -30,7 +30,7 @@ import java.util.NoSuchElementException
public class MultiSet<T> implements Iterable<T>
{
- private Map<T,RefLong> map = new HashMap<T,RefLong>() ;
+ private Map<T,RefLong> map = new HashMap<>() ;
private int multiSetSize = 0 ;
private RefLong _get(T obj)
@@ -131,7 +131,7 @@ public class MultiSet<T> implements Iter
private Iterator<T> iterator1()
{
// CRUDE
- List<T> expanded = new ArrayList<T>() ;
+ List<T> expanded = new ArrayList<>() ;
for ( Map.Entry<T, RefLong> e : map.entrySet() )
{
for ( int i = 0 ; i < e.getValue().value() ; i++ )
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Pair.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Pair.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Pair.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Pair.java Tue Jun 24 09:06:50 2014
@@ -23,7 +23,7 @@ import static org.apache.jena.atlas.lib.
public class Pair<A, B>
{
- public static <L, R> Pair<L,R> create(L x, R y) { return new Pair<L,R>(x,y) ; }
+ public static <L, R> Pair<L,R> create(L x, R y) { return new Pair<>(x,y) ; }
final A a ;
final B b ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolBase.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolBase.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolBase.java Tue Jun 24 09:06:50 2014
@@ -29,7 +29,7 @@ public class PoolBase<T> implements Pool
// For convenience we operate a LIFO policy.
// This not part of the extenal contract of a "pool"
- ArrayDeque<T> pool = new ArrayDeque<T>();
+ ArrayDeque<T> pool = new ArrayDeque<>();
int maxSize = -1 ; // Unbounded
public PoolBase() {}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolFiniteBlocking.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolFiniteBlocking.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolFiniteBlocking.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolFiniteBlocking.java Tue Jun 24 09:06:50 2014
@@ -27,7 +27,7 @@ public class PoolFiniteBlocking<T> imple
{
BlockingDeque<T> pool ;
- public PoolFiniteBlocking(int size) { pool = new LinkedBlockingDeque<T>(size) ; }
+ public PoolFiniteBlocking(int size) { pool = new LinkedBlockingDeque<>(size) ; }
@Override
public final void put(T item)
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolSync.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolSync.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolSync.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PoolSync.java Tue Jun 24 09:06:50 2014
@@ -31,7 +31,7 @@ public class PoolSync<T> implements Pool
PoolSync<T> p = (PoolSync<T>)pool ;
return p ;
}
- return new PoolSync<T>(pool) ;
+ return new PoolSync<>(pool) ;
}
public PoolSync(Pool<T> pool) { this.pool = pool ; }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PropertiesSorted.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PropertiesSorted.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PropertiesSorted.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/PropertiesSorted.java Tue Jun 24 09:06:50 2014
@@ -46,7 +46,7 @@ public class PropertiesSorted extends Pr
{
// Old world - enumeration, untyped. But we know they are strings (Propetries hides non-strings in get)
Enumeration<Object> keys = super.keys() ;
- List<String> keys2 = new ArrayList<String>(super.size()) ;
+ List<String> keys2 = new ArrayList<>(super.size()) ;
for( ; keys.hasMoreElements() ; )
{