jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject svn commit: r1605034 [7/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...
Date Tue, 24 Jun 2014 09:07:06 GMT
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestQueryEngineMultiThreaded.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestQueryEngineMultiThreaded.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestQueryEngineMultiThreaded.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestQueryEngineMultiThreaded.java Tue Jun 24 09:06:50 2014
@@ -46,7 +46,7 @@ import com.hp.hpl.jena.vocabulary.Reason
 public class TestQueryEngineMultiThreaded {
     private class RunResult {
         public int numFailures;
-        public List<Exception> exceptions = new ArrayList<Exception>();
+        public List<Exception> exceptions = new ArrayList<>();
     }
     
     @Test
@@ -114,7 +114,7 @@ public class TestQueryEngineMultiThreade
     }
 
     private List<Thread> createSparqlConstructExecutionThreads(Model model, boolean lock, int expected, RunResult runResult) {
-        List<Thread> threads = new ArrayList<Thread>();
+        List<Thread> threads = new ArrayList<>();
 
         for (int thread = 0; thread < NUMBER_OF_THREADS; thread++) {
             threads.add(createExecuteSparqlConstructThread(model, lock, expected, runResult));
@@ -123,7 +123,7 @@ public class TestQueryEngineMultiThreade
     }
     
     private List<Thread> createSparqlSelectExecutionThreads(Model model, boolean lock, int expected, RunResult runResult) {
-        List<Thread> threads = new ArrayList<Thread>();
+        List<Thread> threads = new ArrayList<>();
         
         for (int thread = 0; thread < NUMBER_OF_THREADS; thread++) {
             threads.add(createExecuteSparqlSelectThread(model, lock, expected, runResult));
@@ -168,11 +168,13 @@ public class TestQueryEngineMultiThreade
     }
 
     private void executeThreads(List<Thread> threads) throws Exception {
-        for (int thread = 0; thread < threads.size(); ++thread) {
-            threads.get(thread).start();
+        for ( Thread thread2 : threads )
+        {
+            thread2.start();
         }
-        for (int thread = 0; thread < threads.size(); ++thread) {
-            threads.get(thread).join();
+        for ( Thread thread1 : threads )
+        {
+            thread1.join();
         }
     }
 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestTableLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestTableLib.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestTableLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/TestTableLib.java Tue Jun 24 09:06:50 2014
@@ -93,7 +93,7 @@ public class TestTableLib extends BaseTe
         
             // Order issues
             
-        Set<String> vars1 = new HashSet<String>() ;
+        Set<String> vars1 = new HashSet<>() ;
         vars1.addAll(left.getVarNames()) ;
         vars1.addAll(right.getVarNames()) ;
         

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/binding/TestBindingStreams.java Tue Jun 24 09:06:50 2014
@@ -147,7 +147,7 @@ public class TestBindingStreams extends 
         ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray()) ;
         BindingInputStream input = new BindingInputStream(in) ;
         
-        List<Binding> results = new ArrayList<Binding>() ;
+        List<Binding> results = new ArrayList<>() ;
         for ( ; input.hasNext() ; )
         {
             results.add(input.next()) ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/index/TestIndexTable.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/index/TestIndexTable.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/index/TestIndexTable.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/index/TestIndexTable.java Tue Jun 24 09:06:50 2014
@@ -66,16 +66,16 @@ public class TestIndexTable {
 	public void setup()
 	{
 		vars = new Var[] { Var.alloc("a"), Var.alloc("b"), Var.alloc("c") } ;
-		order1 = new LinkedHashSet<Var>() ;
-		order2 = new LinkedHashSet<Var>() ;
+		order1 = new LinkedHashSet<>() ;
+		order2 = new LinkedHashSet<>() ;
 		for ( int i = 0 ; i < vars.length ; i++ )
 		{
 			order1.add(vars[i]) ;
 			order2.add(vars[vars.length - i - 1]) ;
 		}
 		
-		fData = new ArrayList<Binding>() ;
-		pData = new ArrayList<Binding>() ;
+		fData = new ArrayList<>() ;
+		pData = new ArrayList<>() ;
 		for ( int i = 10 ; i <= 100 ; i += 10 )
 		{
 			BindingHashMap bindingFull = new BindingHashMap() ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/engine/iterator/TestQueryIterSort.java Tue Jun 24 09:06:50 2014
@@ -71,12 +71,12 @@ public class TestQueryIterSort {
             Var.alloc("4"), Var.alloc("5"), Var.alloc("6"),
             Var.alloc("7"), Var.alloc("8"), Var.alloc("9"), Var.alloc("0")
         };
-        unsorted = new ArrayList<Binding>();
+        unsorted = new ArrayList<>();
         for(int i = 0; i < 500; i++){
             unsorted.add(randomBinding(vars));
         }
         
-        List<SortCondition> conditions = new ArrayList<SortCondition>(); 
+        List<SortCondition> conditions = new ArrayList<>();
         conditions.add(new SortCondition(new ExprVar("8"), Query.ORDER_ASCENDING));
         comparator = new BindingComparator(conditions);
         

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionExpansion.java Tue Jun 24 09:06:50 2014
@@ -64,7 +64,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_01() {
         Expr e = new ExprVar("x");
-        UserDefinedFunctionFactory.getFactory().add("http://example/simple", e, new ArrayList<Var>(e.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/simple", e, new ArrayList<>(e.getVarsMentioned()));
         
         UserDefinedFunction f = (UserDefinedFunction) UserDefinedFunctionFactory.getFactory().create("http://example/simple");
         f.build("http://example/simple", new ExprList(new NodeValueBoolean(true)));
@@ -78,7 +78,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_02() {
         Expr e = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", e, new ArrayList<Var>(e.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", e, new ArrayList<>(e.getVarsMentioned()));
         
         UserDefinedFunction f = (UserDefinedFunction) UserDefinedFunctionFactory.getFactory().create("http://example/square");
         f.build("http://example/square", new ExprList(new NodeValueInteger(3)));
@@ -92,7 +92,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_03() {
         Expr e = new E_Multiply(new ExprVar("x"), new ExprVar("y"));
-        List<Var> defArgs = new ArrayList<Var>();
+        List<Var> defArgs = new ArrayList<>();
         defArgs.add(Var.alloc("x"));
         defArgs.add(Var.alloc("y"));
         UserDefinedFunctionFactory.getFactory().add("http://example/square", e, defArgs);
@@ -112,12 +112,12 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_04() {
         Expr square = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
         
         //Test that with preserveDependencies set to false (the default) that the definition of cube is actually
         //expanded to include the definition of square
         Expr cube = new E_Multiply(new E_Function("http://example/square", new ExprList(new ExprVar("x"))), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<Var>(cube.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<>(cube.getVarsMentioned()));
         
         UserDefinedFunctionDefinition def = UserDefinedFunctionFactory.getFactory().get("http://example/cube");
         Expr base = def.getBaseExpr();
@@ -131,12 +131,12 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_05() {
         Expr square = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
         
         //Test that with preserveDependencies set to false (the default) that the definition of cube is actually
         //expanded to include the definition of square
         Expr cube = new E_Multiply(new E_Function("http://example/square", new ExprList(new ExprVar("y"))), new ExprVar("y"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<Var>(cube.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<>(cube.getVarsMentioned()));
         
         UserDefinedFunctionDefinition def = UserDefinedFunctionFactory.getFactory().get("http://example/cube");
         Expr base = def.getBaseExpr();
@@ -150,7 +150,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_06() {
         Expr takeaway = new E_Subtract(new ExprVar("x"), new ExprVar("y"));
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         UserDefinedFunctionFactory.getFactory().add("http://example/takeaway", takeaway, args);
@@ -173,7 +173,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_07() {
         Expr takeaway = new E_Subtract(new ExprVar("x"), new ExprVar("y"));
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         UserDefinedFunctionFactory.getFactory().add("http://example/takeaway", takeaway, args);
@@ -196,7 +196,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_08() {
         Expr takeaway = new E_Subtract(new ExprVar("x"), new ExprVar("y"));
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         UserDefinedFunctionFactory.getFactory().add("http://example/takeaway", takeaway, args);
@@ -205,7 +205,7 @@ public class TestFunctionExpansion {
         ExprList altArgs = new ExprList();
         altArgs.add(new ExprVar("a"));
         altArgs.add(new ExprVar("b"));
-        ArrayList<Var> defArgs = new ArrayList<Var>();
+        ArrayList<Var> defArgs = new ArrayList<>();
         defArgs.add(Var.alloc("a"));
         defArgs.add(Var.alloc("b"));
         Expr test = new E_Function("http://example/takeaway", altArgs);
@@ -224,7 +224,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_09() {
         Expr takeaway = new E_Subtract(new ExprVar("x"), new ExprVar("y"));
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         UserDefinedFunctionFactory.getFactory().add("http://example/takeaway", takeaway, args);
@@ -233,7 +233,7 @@ public class TestFunctionExpansion {
         ExprList altArgs = new ExprList();
         altArgs.add(new ExprVar("b"));
         altArgs.add(new ExprVar("a"));
-        ArrayList<Var> defArgs = new ArrayList<Var>();
+        ArrayList<Var> defArgs = new ArrayList<>();
         defArgs.add(Var.alloc("a"));
         defArgs.add(Var.alloc("b"));
         Expr test = new E_Function("http://example/takeaway", altArgs);
@@ -252,11 +252,11 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_10() {
         Expr single = new ExprVar("x");
-        UserDefinedFunctionFactory.getFactory().add("http://example/single", single, new ArrayList<Var>(single.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/single", single, new ArrayList<>(single.getVarsMentioned()));
         
         //Test that with preserveDependencies set to false (the default) that the definition is expanded appropriately
         //when the outer function has differing numbers of arguments
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         Expr add = new E_Add(new E_Function("http://example/single", new ExprList(new ExprVar("x"))), new ExprVar("y"));
@@ -275,11 +275,11 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_11() {
         Expr single = new ExprVar("x");
-        UserDefinedFunctionFactory.getFactory().add("http://example/single", single, new ArrayList<Var>(single.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/single", single, new ArrayList<>(single.getVarsMentioned()));
         
         //Test that with preserveDependencies set to false (the default) that the definition is expanded appropriately
         //when the outer function has differing numbers of arguments
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         Expr add = new E_Add(new E_Function("http://example/single", new ExprList(new ExprVar("y"))), new ExprVar("y"));
@@ -298,7 +298,7 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_12() {
         Expr takeaway = new E_Subtract(new ExprVar("x"), new ExprVar("y"));
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         UserDefinedFunctionFactory.getFactory().add("http://example/takeaway", takeaway, args);
@@ -307,7 +307,7 @@ public class TestFunctionExpansion {
         ExprList altArgs = new ExprList();
         altArgs.add(new ExprVar("a"));
         altArgs.add(new ExprVar("a"));
-        ArrayList<Var> defArgs = new ArrayList<Var>();
+        ArrayList<Var> defArgs = new ArrayList<>();
         defArgs.add(Var.alloc("a"));
         defArgs.add(Var.alloc("b"));
         Expr test = new E_Function("http://example/takeaway", altArgs);
@@ -326,13 +326,13 @@ public class TestFunctionExpansion {
     @Test
     public void test_function_expansion_13() {
         Expr square = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
         
         //This test illustrates that if we change the definition of square and call our function again we always
         //get the same result with dependencies not preserved because even though the definition of the dependent function 
         //can change the definition of our function is fully expanded when first defined
         Expr cube = new E_Multiply(new E_Function("http://example/square", new ExprList(new ExprVar("x"))), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<Var>(cube.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<>(cube.getVarsMentioned()));
         
         UserDefinedFunction f = (UserDefinedFunction) UserDefinedFunctionFactory.getFactory().create("http://example/cube");
         f.build("http://example/cube", new ExprList(new NodeValueInteger(2)));
@@ -345,7 +345,7 @@ public class TestFunctionExpansion {
         //This has no effect with preserveDependencies set to false (the default) since we fully expanded the call to the dependent
         //function when our outer function was defined
         square = new ExprVar("x");
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
         f.build("http://example/cube", new ExprList(new NodeValueInteger(2)));
         
         actual = f.getActualExpr();
@@ -355,7 +355,7 @@ public class TestFunctionExpansion {
     
     @Test(expected=ExprBuildException.class)
     public void test_function_expansion_bad_01() {
-        List<Var> args = new ArrayList<Var>();
+        List<Var> args = new ArrayList<>();
         args.add(Var.alloc("x"));
         args.add(Var.alloc("y"));
         Expr add = new E_Add(new ExprVar("x"), new ExprVar("y"));
@@ -367,7 +367,7 @@ public class TestFunctionExpansion {
     @Test(expected=ExprBuildException.class)
     public void test_function_expansion_bad_02() {
         Expr single = new ExprVar("x");
-        UserDefinedFunctionFactory.getFactory().add("http://example/single", single, new ArrayList<Var>(single.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/single", single, new ArrayList<>(single.getVarsMentioned()));
         
         //It's an error to use a variable which is not mentioned in the argument list, even in a call to a dependent function
         Expr test = new E_Function("http://example/single", new ExprList(new ExprVar("x")));

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestFunctionNonExpansion.java Tue Jun 24 09:06:50 2014
@@ -18,24 +18,18 @@
 
 package com.hp.hpl.jena.sparql.function.user;
 
-import java.util.ArrayList;
+import java.util.ArrayList ;
 
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.hp.hpl.jena.sparql.core.Var;
-import com.hp.hpl.jena.sparql.engine.binding.BindingFactory;
-import com.hp.hpl.jena.sparql.expr.E_Function;
-import com.hp.hpl.jena.sparql.expr.E_Multiply;
-import com.hp.hpl.jena.sparql.expr.Expr;
-import com.hp.hpl.jena.sparql.expr.ExprList;
-import com.hp.hpl.jena.sparql.expr.ExprVar;
-import com.hp.hpl.jena.sparql.expr.NodeValue;
-import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueInteger;
-import com.hp.hpl.jena.sparql.function.FunctionEnvBase;
-import com.hp.hpl.jena.sparql.util.NodeFactoryExtra;
+import org.junit.AfterClass ;
+import org.junit.Assert ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.sparql.engine.binding.BindingFactory ;
+import com.hp.hpl.jena.sparql.expr.* ;
+import com.hp.hpl.jena.sparql.expr.nodevalue.NodeValueInteger ;
+import com.hp.hpl.jena.sparql.function.FunctionEnvBase ;
+import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 
 /**
  * Tests which check that functions are not expanded when {@link UserDefinedFunctionFactory#setPreserveDependencies(boolean)} is set to true
@@ -58,11 +52,11 @@ public class TestFunctionNonExpansion {
     @Test
     public void test_function_non_expansion_01() {
         Expr square = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
         
         //Test that with preserveDependencies set to true that the definition of cube is not expanded
         Expr cube = new E_Multiply(new E_Function("http://example/square", new ExprList(new ExprVar("x"))), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<Var>(cube.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<>(cube.getVarsMentioned()));
         
         UserDefinedFunctionDefinition def = UserDefinedFunctionFactory.getFactory().get("http://example/cube");
         Expr base = def.getBaseExpr();
@@ -78,12 +72,12 @@ public class TestFunctionNonExpansion {
     @Test
     public void test_function_non_expansion_02() {
         Expr square = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
         
         //This test illustrates that if we change the definition of square and call our function again we can
         //get a different result with dependencies preserved because the definition of the dependent function can change
         Expr cube = new E_Multiply(new E_Function("http://example/square", new ExprList(new ExprVar("x"))), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<Var>(cube.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/cube", cube, new ArrayList<>(cube.getVarsMentioned()));
         
         UserDefinedFunction f = (UserDefinedFunction) UserDefinedFunctionFactory.getFactory().create("http://example/cube");
         f.build("http://example/cube", new ExprList(new NodeValueInteger(2)));
@@ -94,7 +88,7 @@ public class TestFunctionNonExpansion {
         
         //Change the definition of the function we depend on
         square = new ExprVar("x");
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
         f.build("http://example/cube", new ExprList(new NodeValueInteger(2)));
         
         actual = f.getActualExpr();

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserDefinedFunctionFactory.java Tue Jun 24 09:06:50 2014
@@ -18,19 +18,17 @@
 
 package com.hp.hpl.jena.sparql.function.user;
 
-import java.util.ArrayList;
+import java.util.ArrayList ;
 
-import org.junit.Assert;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.hp.hpl.jena.sparql.core.Var;
-import com.hp.hpl.jena.sparql.expr.E_Multiply;
-import com.hp.hpl.jena.sparql.expr.Expr;
-import com.hp.hpl.jena.sparql.expr.ExprVar;
-import com.hp.hpl.jena.sparql.lang.sparql_11.ParseException;
+import org.junit.AfterClass ;
+import org.junit.Assert ;
+import org.junit.BeforeClass ;
+import org.junit.Test ;
+
+import com.hp.hpl.jena.sparql.expr.E_Multiply ;
+import com.hp.hpl.jena.sparql.expr.Expr ;
+import com.hp.hpl.jena.sparql.expr.ExprVar ;
+import com.hp.hpl.jena.sparql.lang.sparql_11.ParseException ;
 
 /**
  * Tests for the {@link UserDefinedFunctionFactory}
@@ -57,7 +55,7 @@ public class TestUserDefinedFunctionFact
     @Test
     public void test_user_defined_function_factory_add_01() {
         Expr e = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", e, new ArrayList<Var>(e.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", e, new ArrayList<>(e.getVarsMentioned()));
         Assert.assertTrue(UserDefinedFunctionFactory.getFactory().isRegistered("http://example/square"));
         Assert.assertEquals(e, UserDefinedFunctionFactory.getFactory().get("http://example/square").getBaseExpr());
     }
@@ -67,11 +65,11 @@ public class TestUserDefinedFunctionFact
         Expr e1 = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
         Expr e2 = new E_Multiply(new ExprVar("y"), new ExprVar("y"));
         
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", e1, new ArrayList<Var>(e1.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", e1, new ArrayList<>(e1.getVarsMentioned()));
         Assert.assertTrue(UserDefinedFunctionFactory.getFactory().isRegistered("http://example/square"));
         Assert.assertEquals(e1, UserDefinedFunctionFactory.getFactory().get("http://example/square").getBaseExpr());
         
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", e2, new ArrayList<Var>(e2.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", e2, new ArrayList<>(e2.getVarsMentioned()));
         Assert.assertTrue(UserDefinedFunctionFactory.getFactory().isRegistered("http://example/square"));
         Assert.assertEquals(e2, UserDefinedFunctionFactory.getFactory().get("http://example/square").getBaseExpr());
     }
@@ -81,7 +79,7 @@ public class TestUserDefinedFunctionFact
         Expr e = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
         
         //Instead of registering the pre-built expression register using a string for the expression
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", "?x * ?x", new ArrayList<Var>(e.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", "?x * ?x", new ArrayList<>(e.getVarsMentioned()));
         
         Assert.assertTrue(UserDefinedFunctionFactory.getFactory().isRegistered("http://example/square"));
         Assert.assertEquals(e, UserDefinedFunctionFactory.getFactory().get("http://example/square").getBaseExpr());

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/function/user/TestUserFunctionsInSparql.java Tue Jun 24 09:06:50 2014
@@ -52,7 +52,7 @@ public class TestUserFunctionsInSparql {
         
         //Define a square function
         Expr square = new E_Multiply(new ExprVar("x"), new ExprVar("x"));
-        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<Var>(square.getVarsMentioned()));
+        UserDefinedFunctionFactory.getFactory().add("http://example/square", square, new ArrayList<>(square.getVarsMentioned()));
     }
     
     @AfterClass

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestDatasets.java Tue Jun 24 09:06:50 2014
@@ -73,7 +73,7 @@ public class TestDatasets {
 		QueryExecution exec = QueryExecutionFactory.create(q, ds);
 		
 		ResultSet results = exec.execSelect();
-		List<String> found = new ArrayList<String>();
+		List<String> found = new ArrayList<>();
 		int count = 0;
 		while (results.hasNext()) {
 			count++;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/QueryTest.java Tue Jun 24 09:06:50 2014
@@ -252,7 +252,7 @@ public class QueryTest extends EarlTestC
 
     private ResultSetRewindable convertToStrings(ResultSetRewindable resultsActual)
     {
-        List<Binding> bindings = new ArrayList<Binding>()  ;
+        List<Binding> bindings = new ArrayList<>()  ;
         while(resultsActual.hasNext())
         {
             Binding b = resultsActual.nextBinding() ;
@@ -280,8 +280,8 @@ public class QueryTest extends EarlTestC
     private static ResultSetRewindable unique(ResultSetRewindable results)
     {
         // VERY crude.  Utilises the fact that bindings have value equality.
-        List<Binding> x = new ArrayList<Binding>() ;
-        Set<Binding> seen = new HashSet<Binding>() ;
+        List<Binding> x = new ArrayList<>() ;
+        Set<Binding> seen = new HashSet<>() ;
         
         for ( ; results.hasNext() ; )
         {
@@ -475,13 +475,17 @@ public class QueryTest extends EarlTestC
         String tmp = "" ;
         if ( testItem.getDefaultGraphURIs() != null )
         {
-            for ( Iterator<String> iter = testItem.getDefaultGraphURIs().iterator() ; iter.hasNext() ; )
-                tmp = tmp+iter.next() ;
+            for ( String s : testItem.getDefaultGraphURIs() )
+            {
+                tmp = tmp + s;
+            }
         }
         if ( testItem.getNamedGraphURIs() != null )
         {
-            for ( Iterator<String> iter = testItem.getNamedGraphURIs().iterator() ; iter.hasNext() ; )
-                tmp = tmp+iter.next() ;
+            for ( String s : testItem.getNamedGraphURIs() )
+            {
+                tmp = tmp + s;
+            }
         }
         
         String d = "Test "+testNumber+" :: "+testItem.getName() ;

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestItem.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestItem.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestItem.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/TestItem.java Tue Jun 24 09:06:50 2014
@@ -100,9 +100,9 @@ public class TestItem
     private TestItem(String _name, String _queryFile, String _dataFile, String _resultFile) {
         name = _name ;
         queryFile = _queryFile ;
-        defaultGraphURIs = new ArrayList<String>() ;
+        defaultGraphURIs = new ArrayList<>() ;
         defaultGraphURIs.add(_dataFile) ;
-        namedGraphURIs = new ArrayList<String>() ;
+        namedGraphURIs = new ArrayList<>() ;
         resultFile = _resultFile ;
         comment = "" ;
         queryFileSyntax = Syntax.guessFileSyntax(_queryFile) ;
@@ -221,7 +221,7 @@ public class TestItem
             // Action is a URI - data had better be in the query itself.
             return null ;
 
-        List<String> l = new ArrayList<String>() ;
+        List<String> l = new ArrayList<>() ;
         ClosableIterator<Statement> cIter = _getAction().listProperties(VocabTestQuery.data) ;
         for (; cIter.hasNext();) {
             Statement stmt = cIter.next() ;
@@ -244,7 +244,7 @@ public class TestItem
             // Action is a URI - data had better be in the query itself.
             return null ;
 
-        List<String> l = new ArrayList<String>() ;
+        List<String> l = new ArrayList<>() ;
         ClosableIterator<Statement> cIter = _getAction().listProperties(VocabTestQuery.graphData) ;
         for (; cIter.hasNext();) {
             Statement obj = cIter.next() ;
@@ -304,7 +304,7 @@ public class TestItem
 
     @Override
     public String toString() {
-        StringBuffer sbuff = new StringBuffer() ;
+        StringBuilder sbuff = new StringBuilder() ;
         String name = getName() ;
         // String actionStr = FmtUtils.stringForRDFNode(_getAction()) ;
 

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/junit/UpdateTest.java Tue Jun 24 09:06:50 2014
@@ -206,7 +206,7 @@ public class UpdateTest extends EarlTest
 
     static List<String> getAll(Resource r, Property p)
     {
-        List<String> l = new ArrayList<String>() ;
+        List<String> l = new ArrayList<>() ;
         ClosableIterator<Statement> cIter =  r.listProperties(p) ;
         for ( ; cIter.hasNext() ; )
         {

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath.java Tue Jun 24 09:06:50 2014
@@ -343,7 +343,7 @@ public class TestPath extends BaseTest
     static boolean sameUnorder(List<Node> expected, List<Node> results)
     {
         // Copy - this is modified.
-        List<Node> x = new ArrayList<Node>(results) ;
+        List<Node> x = new ArrayList<>(results) ;
         for ( Node n : expected )
         {
             if ( ! x.contains(n) )

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/path/TestPath2.java Tue Jun 24 09:06:50 2014
@@ -115,7 +115,7 @@ public class TestPath2 extends BaseTest
 	    
         List<Node> nodes1 = Iter.toList(PathEval.eval(graph, start, PathFactory.pathDistinct(path), ARQ.getContext() )) ;
         List<Node> nodes2 = Iter.toList(PathEval.eval(graph, start, path, ARQ.getContext() )) ;
-        List<Node> expected = new ArrayList<Node>() ;
+        List<Node> expected = new ArrayList<>() ;
         for ( String n : results )
             expected.add(parse(n)) ;
         List<Node> expected1 = Iter.iter(expected).distinct().toList() ;
@@ -143,7 +143,7 @@ public class TestPath2 extends BaseTest
 	private static void assertSameArray(List<Node> expected, List<Node> actual)
 	{
 	    assertEquals(expected.size(), actual.size()) ;
-	    List<Node> x = new ArrayList<Node>(expected) ;
+	    List<Node> x = new ArrayList<>(expected) ;
 	    for ( Node n : actual )
 	    {
 	        if ( x.contains(n) )

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/resultset/TestResultSet.java Tue Jun 24 09:06:50 2014
@@ -515,7 +515,7 @@ public class TestResultSet extends BaseT
     {
         BindingMap b = BindingFactory.create() ;
         b.add(Var.alloc(var), val) ;
-        List<String> vars = new ArrayList<String>() ;
+        List<String> vars = new ArrayList<>() ;
         vars.add(var) ;
         QueryIterator qIter = QueryIterSingleton.create(b, null) ;
         ResultSet rs = new ResultSetStream(vars, null, qIter) ;
@@ -529,10 +529,10 @@ public class TestResultSet extends BaseT
         BindingMap b2 = BindingFactory.create() ;
         b2.add(Var.alloc(var), val) ;
         
-        List<String> vars = new ArrayList<String>() ;
+        List<String> vars = new ArrayList<>() ;
         vars.add(var) ;
 
-        List<Binding> solutions = new ArrayList<Binding>() ;
+        List<Binding> solutions = new ArrayList<>() ;
         solutions.add(b1) ;
         solutions.add(b2) ;
         
@@ -563,7 +563,7 @@ public class TestResultSet extends BaseT
         b.add(Var.alloc(var1), val1) ;
         b.add(Var.alloc(var2), val2) ;
         
-        List<String> vars = new ArrayList<String>() ;
+        List<String> vars = new ArrayList<>() ;
         vars.add(var1) ;
         vars.add(var2) ;
         

Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/syntax/TestSSE_Basic.java Tue Jun 24 09:06:50 2014
@@ -29,7 +29,6 @@ import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.sse.Item ;
 import com.hp.hpl.jena.sparql.sse.ItemException ;
 import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.sparql.sse.SSEParseException ;
 import com.hp.hpl.jena.sparql.util.NodeFactoryExtra ;
 
 public class TestSSE_Basic extends TestCase
@@ -374,8 +373,7 @@ public class TestSSE_Basic extends TestC
             Item item = SSE.parse(str) ;
             //System.out.println(str+" => "+item) ;
             fail("Did not get a parse failure") ;
-        } 
-        catch (SSEParseException ex) {}
+        }
         catch (ARQException ex) {}
     }
     
@@ -388,7 +386,6 @@ public class TestSSE_Basic extends TestC
             fail("Did not get a parse failure") ;
         } 
         //catch (RiotException ex) {}
-        catch (SSEParseException ex) {}
         catch (ARQException ex) {}
     }
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/csv/TestCSVParser.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/csv/TestCSVParser.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/csv/TestCSVParser.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/csv/TestCSVParser.java Tue Jun 24 09:06:50 2014
@@ -87,10 +87,10 @@ public class TestCSVParser extends BaseT
     
     private void csv(String input, String[][] strings)
     {
-        List<List<String>> x = new ArrayList<List<String>>() ;
+        List<List<String>> x = new ArrayList<>() ;
         for ( String[] a : strings )
         {
-            List<String> y = new ArrayList<String>() ;
+            List<String> y = new ArrayList<>() ;
             for ( String b : a )
                 y.add(b) ;
             x.add(y) ;
@@ -100,7 +100,7 @@ public class TestCSVParser extends BaseT
     
     private static void csv(String input, List<List<String>> answers)
     {
-        List<List<String>> x = new ArrayList<List<String>>() ;
+        List<List<String>> x = new ArrayList<>() ;
         try {
             InputStream in = new ByteArrayInputStream(input.getBytes("UTF-8")) ;
             CSVTokenIterator iter = new CSVTokenIterator(in) ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataBag.java Tue Jun 24 09:06:50 2014
@@ -61,7 +61,7 @@ public class TestDistinctDataBag extends
     
     @Test public void testDistinct()
     {
-        List<Binding> undistinct = new ArrayList<Binding>();
+        List<Binding> undistinct = new ArrayList<>();
         undistinct.add(b12);
         undistinct.add(b19);
         undistinct.add(b02);
@@ -72,10 +72,10 @@ public class TestDistinctDataBag extends
         undistinct.add(x10);
         
         List<Binding> control = Iter.toList(Iter.distinct(undistinct.iterator()));
-        List<Binding> distinct = new ArrayList<Binding>();
+        List<Binding> distinct = new ArrayList<>();
         
         
-        DistinctDataBag<Binding> db = new DistinctDataBag<Binding>(
+        DistinctDataBag<Binding> db = new DistinctDataBag<>(
                 new ThresholdPolicyCount<Binding>(2),
                 SerializationFactoryFinder.bindingSerializationFactory(),
                 new BindingComparator(new ArrayList<SortCondition>())); 
@@ -101,7 +101,7 @@ public class TestDistinctDataBag extends
     
     @Test public void testTemporaryFilesAreCleanedUpAfterCompletion()
     {
-        List<Binding> undistinct = new ArrayList<Binding>();
+        List<Binding> undistinct = new ArrayList<>();
         random = new Random();
         Var[] vars = new Var[]{
             Var.alloc("1"), Var.alloc("2"), Var.alloc("3"),
@@ -112,12 +112,12 @@ public class TestDistinctDataBag extends
             undistinct.add(randomBinding(vars));
         }
         
-        DistinctDataBag<Binding> db = new DistinctDataBag<Binding>(
+        DistinctDataBag<Binding> db = new DistinctDataBag<>(
                 new ThresholdPolicyCount<Binding>(10),
                 SerializationFactoryFinder.bindingSerializationFactory(),
                 new BindingComparator(new ArrayList<SortCondition>()));
         
-        List<File> spillFiles = new ArrayList<File>();
+        List<File> spillFiles = new ArrayList<>();
         try
         {
             db.addAll(undistinct);

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestDistinctDataNet.java Tue Jun 24 09:06:50 2014
@@ -62,7 +62,7 @@ public class TestDistinctDataNet extends
     @Test
     public void testDistinct()
     {
-        List<Binding> undistinct = new ArrayList<Binding>();
+        List<Binding> undistinct = new ArrayList<>();
         undistinct.add(b12);
         undistinct.add(b19);
         undistinct.add(b02);
@@ -73,10 +73,10 @@ public class TestDistinctDataNet extends
         undistinct.add(x10);
         
         List<Binding> control = Iter.toList(Iter.distinct(undistinct.iterator()));
-        List<Binding> distinct = new ArrayList<Binding>();
+        List<Binding> distinct = new ArrayList<>();
         
         
-        DistinctDataNet<Binding> db = new DistinctDataNet<Binding>(
+        DistinctDataNet<Binding> db = new DistinctDataNet<>(
                 new ThresholdPolicyCount<Binding>(2),
                 SerializationFactoryFinder.bindingSerializationFactory(),
                 new BindingComparator(new ArrayList<SortCondition>())); 
@@ -103,7 +103,7 @@ public class TestDistinctDataNet extends
     @Test
     public void testDistinct2()
     {
-        List<Binding> undistinct = new ArrayList<Binding>();
+        List<Binding> undistinct = new ArrayList<>();
         undistinct.add(b12);
         undistinct.add(b19);
         undistinct.add(b02);
@@ -114,10 +114,10 @@ public class TestDistinctDataNet extends
         undistinct.add(x10);
         
         List<Binding> control = Iter.toList(Iter.distinct(undistinct.iterator()));
-        List<Binding> distinct = new ArrayList<Binding>();
+        List<Binding> distinct = new ArrayList<>();
         
         
-        DistinctDataNet<Binding> db = new DistinctDataNet<Binding>(
+        DistinctDataNet<Binding> db = new DistinctDataNet<>(
                 new ThresholdPolicyCount<Binding>(2),
                 SerializationFactoryFinder.bindingSerializationFactory(),
                 new BindingComparator(new ArrayList<SortCondition>())); 
@@ -150,7 +150,7 @@ public class TestDistinctDataNet extends
     @Test
     public void testTemporaryFilesAreCleanedUpAfterCompletion()
     {
-        List<Binding> undistinct = new ArrayList<Binding>();
+        List<Binding> undistinct = new ArrayList<>();
         random = new Random();
         Var[] vars = new Var[]{
             Var.alloc("1"), Var.alloc("2"), Var.alloc("3"),
@@ -161,12 +161,12 @@ public class TestDistinctDataNet extends
             undistinct.add(randomBinding(vars));
         }
         
-        DistinctDataNet<Binding> db = new DistinctDataNet<Binding>(
+        DistinctDataNet<Binding> db = new DistinctDataNet<>(
                 new ThresholdPolicyCount<Binding>(10),
                 SerializationFactoryFinder.bindingSerializationFactory(),
                 new BindingComparator(new ArrayList<SortCondition>()));
         
-        List<File> spillFiles = new ArrayList<File>();
+        List<File> spillFiles = new ArrayList<>();
         try
         {
             db.addAll(undistinct);

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestSortedDataBag.java Tue Jun 24 09:06:50 2014
@@ -60,15 +60,15 @@ public class TestSortedDataBag extends T
     {
         List<Binding> unsorted = randomBindings(numBindings);
         
-        List<SortCondition> conditions = new ArrayList<SortCondition>(); 
+        List<SortCondition> conditions = new ArrayList<>();
         conditions.add(new SortCondition(new ExprVar("8"), Query.ORDER_ASCENDING));
         conditions.add(new SortCondition(new ExprVar("1"), Query.ORDER_ASCENDING));
         conditions.add(new SortCondition(new ExprVar("0"), Query.ORDER_DESCENDING));
         BindingComparator comparator = new BindingComparator(conditions);
 
-        List<Binding> sorted = new ArrayList<Binding>();
+        List<Binding> sorted = new ArrayList<>();
         
-        SortedDataBag<Binding> db = new SortedDataBag<Binding>(
+        SortedDataBag<Binding> db = new SortedDataBag<>(
                 new ThresholdPolicyCount<Binding>(threshold),
                 SerializationFactoryFinder.bindingSerializationFactory(),
                 comparator);
@@ -119,16 +119,16 @@ public class TestSortedDataBag extends T
     {
         List<Binding> unsorted = randomBindings(500);
         
-        List<SortCondition> conditions = new ArrayList<SortCondition>(); 
+        List<SortCondition> conditions = new ArrayList<>();
         conditions.add(new SortCondition(new ExprVar("8"), Query.ORDER_ASCENDING));
         BindingComparator comparator = new BindingComparator(conditions);
         
-        SortedDataBag<Binding> db = new SortedDataBag<Binding>(
+        SortedDataBag<Binding> db = new SortedDataBag<>(
                 new ThresholdPolicyCount<Binding>(10),
                 SerializationFactoryFinder.bindingSerializationFactory(),
                 comparator);
         
-        List<File> spillFiles = new ArrayList<File>();
+        List<File> spillFiles = new ArrayList<>();
         try
         {
             db.addAll(unsorted);
@@ -176,7 +176,7 @@ public class TestSortedDataBag extends T
             Var.alloc("4"), Var.alloc("5"), Var.alloc("6"),
             Var.alloc("7"), Var.alloc("8"), Var.alloc("9"), Var.alloc("0")
         };
-        List<Binding> toReturn = new ArrayList<Binding>();
+        List<Binding> toReturn = new ArrayList<>();
         for(int i = 0; i < numBindings; i++){
             toReturn.add(randomBinding(vars));
         }

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/data/TestThresholdPolicyCount.java Tue Jun 24 09:06:50 2014
@@ -29,21 +29,21 @@ public class TestThresholdPolicyCount ex
     @Test
     public void count_01()
     {
-        ThresholdPolicyCount<String> policy = new ThresholdPolicyCount<String>(0);
+        ThresholdPolicyCount<String> policy = new ThresholdPolicyCount<>(0);
         assertTrue(policy.isThresholdExceeded());
     }
     
     @Test
     public void count_02()
     {
-        ThresholdPolicyCount<String> policy = new ThresholdPolicyCount<String>(1);
+        ThresholdPolicyCount<String> policy = new ThresholdPolicyCount<>(1);
         assertFalse(policy.isThresholdExceeded());
     }
     
     @Test
     public void count_03()
     {
-        ThresholdPolicyCount<String> policy = new ThresholdPolicyCount<String>(1);
+        ThresholdPolicyCount<String> policy = new ThresholdPolicyCount<>(1);
         assertFalse(policy.isThresholdExceeded());
         policy.increment("a");
         assertTrue(policy.isThresholdExceeded());

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIter.java Tue Jun 24 09:06:50 2014
@@ -31,7 +31,7 @@ import org.junit.Test ;
 
 public class TestIter
 {
-    List<String> data0 = new ArrayList<String>() ;
+    List<String> data0 = new ArrayList<>() ;
     List<String> data1 = Arrays.asList("a") ;
     List<String> data2 = Arrays.asList("x","y","z") ;
     List<String> data3 = Arrays.asList(null, "x", null, null, null, "y", "z", null);
@@ -61,11 +61,11 @@ public class TestIter
     @Test
     public void append_4()
     {
-        List<String> L = new ArrayList<String>(3);
+        List<String> L = new ArrayList<>(3);
         L.add("a");
         L.add("b");
         L.add("c");
-        List<String> R = new ArrayList<String>(3);
+        List<String> R = new ArrayList<>(3);
         R.add("d");
         R.add("e");
         R.add("f");
@@ -91,11 +91,11 @@ public class TestIter
     @Test
     public void append_5()
     {
-        List<String> L = new ArrayList<String>(3);
+        List<String> L = new ArrayList<>(3);
         L.add("a");
         L.add("b");
         L.add("c");
-        List<String> R = new ArrayList<String>(3);
+        List<String> R = new ArrayList<>(3);
         R.add("d");
         R.add("e");
         R.add("f");
@@ -121,11 +121,11 @@ public class TestIter
     @Test
     public void append_6()
     {
-        List<String> L = new ArrayList<String>(3);
+        List<String> L = new ArrayList<>(3);
         L.add("a");
         L.add("b");
         L.add("c");
-        List<String> R = new ArrayList<String>(3);
+        List<String> R = new ArrayList<>(3);
         R.add("d");
         R.add("e");
         R.add("f");
@@ -244,7 +244,7 @@ public class TestIter
             @Override
             public Iterator<String> convert(String item)
             {
-                List<String> l = new ArrayList<String>(2);
+                List<String> l = new ArrayList<>(2);
                 l.add(item);
                 l.add(item + item);
                 return l.iterator();

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java Tue Jun 24 09:06:50 2014
@@ -29,13 +29,13 @@ import org.junit.Test ;
 
 public class TestIteratorPeek extends BaseTest
 {
-    List<String> data0 = new ArrayList<String>() ;
-    List<String> data1 = new ArrayList<String>() ;
+    List<String> data0 = new ArrayList<>() ;
+    List<String> data1 = new ArrayList<>() ;
     {
         data1.add("a") ;
     }
     
-    List<String> data2 = new ArrayList<String>() ;
+    List<String> data2 = new ArrayList<>() ;
     {
         data2.add("x") ;
         data2.add("y") ;
@@ -61,7 +61,7 @@ public class TestIteratorPeek extends Ba
     
     private static PeekIterator<String> create(String...a)
     { 
-        return new PeekIterator<String>(IteratorArray.create(a)) ;
+        return new PeekIterator<>(IteratorArray.create(a)) ;
     }
     
     @Test public void peek_1()

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPushback.java Tue Jun 24 09:06:50 2014
@@ -29,7 +29,7 @@ import org.junit.Test ;
 public class TestIteratorPushback extends BaseTest
 {
 
-    static List<String> data = new ArrayList<String>() ;
+    static List<String> data = new ArrayList<>() ;
     static {
         data.add("a") ;
         data.add("b") ;
@@ -41,7 +41,7 @@ public class TestIteratorPushback extend
     
     @Test public void pushback02()
     { 
-        PushbackIterator<String> iter = new PushbackIterator<String>(data.iterator()) ;
+        PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ;
         assertEquals("a", iter.next()) ;
         assertEquals("b", iter.next()) ;
         assertEquals("c", iter.next()) ;
@@ -50,7 +50,7 @@ public class TestIteratorPushback extend
     
     @Test public void pushback03()
     { 
-        PushbackIterator<String> iter = new PushbackIterator<String>(data.iterator()) ;
+        PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ;
         iter.pushback("x") ;
         assertEquals("x", iter.next()) ;
         assertEquals("a", iter.next()) ;
@@ -59,7 +59,7 @@ public class TestIteratorPushback extend
     
     @Test public void pushback04()
     { 
-        PushbackIterator<String> iter = new PushbackIterator<String>(data.iterator()) ;
+        PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ;
         assertEquals("a", iter.next()) ;
         iter.pushback("x") ;
         assertEquals("x", iter.next()) ;
@@ -69,7 +69,7 @@ public class TestIteratorPushback extend
     
     @Test public void pushback05()
     { 
-        PushbackIterator<String> iter = new PushbackIterator<String>(data.iterator()) ;
+        PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ;
         assertEquals("a", iter.next()) ;
         iter.pushback("x") ;
         iter.pushback("y") ;
@@ -81,7 +81,7 @@ public class TestIteratorPushback extend
     
     @Test public void pushback06()
     { 
-        PushbackIterator<String> iter = new PushbackIterator<String>(data.iterator()) ;
+        PushbackIterator<String> iter = new PushbackIterator<>(data.iterator()) ;
         assertEquals(3, Iter.count(iter)) ;
         iter.pushback("x") ;
         iter.pushback("y") ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java Tue Jun 24 09:06:50 2014
@@ -90,7 +90,7 @@ public class TestIteratorWithBuffer exte
     private IteratorWithBuffer<String> createBuffered(int N, String... strings)
     {
         List<String> data = Arrays.asList(strings) ;
-        IteratorWithBuffer<String> iter = new IteratorWithBuffer<String>(data.iterator(), N) ;
+        IteratorWithBuffer<String> iter = new IteratorWithBuffer<>(data.iterator(), N) ;
         return iter ;
     }
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java Tue Jun 24 09:06:50 2014
@@ -80,7 +80,7 @@ public class TestIteratorWithHistory ext
     private IteratorWithHistory<String> createHistory(int N, String... strings)
     {
         List<String> data = Arrays.asList(strings) ;
-        IteratorWithHistory<String> iter = new IteratorWithHistory<String>(data.iterator(), N) ;
+        IteratorWithHistory<String> iter = new IteratorWithHistory<>(data.iterator(), N) ;
         return iter ;
     }
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/junit/BaseTest.java Tue Jun 24 09:06:50 2014
@@ -27,7 +27,7 @@ import org.junit.Assert ;
 
 public class BaseTest extends Assert
 {
-    private static Deque<ErrorHandler> errorHandlers = new ArrayDeque<ErrorHandler>() ;
+    private static Deque<ErrorHandler> errorHandlers = new ArrayDeque<>() ;
     
     static public void setTestLogging(ErrorHandler errorhandler)
     {
@@ -71,7 +71,7 @@ public class BaseTest extends Assert
     public static <T> void assertEqualsUnordered(List<T> list1, List<T> list2) {
         if ( list1.size() != list2.size() )
             fail("Expected: "+list1+" : Actual: "+list2) ;
-        List<T> list2a = new ArrayList<T>(list2) ;
+        List<T> list2a = new ArrayList<>(list2) ;
         for ( T elt : list1 )
             list2a.remove(elt) ;
         if ( list2a.size() != 0 )

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache.java Tue Jun 24 09:06:50 2014
@@ -67,7 +67,7 @@ public class TestCache extends BaseTest
         public Cache<Integer, Integer> make(int size)
         { 
             Cache<Integer, Integer> c = CacheFactory.createCache(size) ;
-            return new CacheStatsSimple<Integer, Integer>(c) ;
+            return new CacheStatsSimple<>(c) ;
         }
         @Override
         public String name() { return "Stats" ; }
@@ -81,7 +81,7 @@ public class TestCache extends BaseTest
         public Cache<Integer, Integer> make(int size)
         { 
             Cache<Integer, Integer> c = CacheFactory.createCache(size) ;
-            return new CacheStatsAtomic<Integer, Integer>(c) ;
+            return new CacheStatsAtomic<>(c) ;
         }
         @Override
         public String name() { return "StatsAtomic" ; }

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCache2.java Tue Jun 24 09:06:50 2014
@@ -31,7 +31,7 @@ public class TestCache2 extends BaseTest
     // Cache1
     @Test public void cache_10()
     {
-        Cache<Integer, String> cache = new Cache1<Integer, String>() ;
+        Cache<Integer, String> cache = new Cache1<>() ;
         String str = cache.get(1) ;
         assertNull(str) ;
 

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestCacheStats.java Tue Jun 24 09:06:50 2014
@@ -35,7 +35,7 @@ public class TestCacheStats extends Base
     @Test public void stats_01()
     {
         cache.clear() ;
-        cache = new CacheStatsAtomic<Integer, Integer>(cache) ;
+        cache = new CacheStatsAtomic<>(cache) ;
         CacheStats<Integer, Integer> cs = (CacheStats<Integer, Integer>)cache ;
         assertEquals(0,cs.getCacheEntries()) ;
         assertEquals(0,cs.getCacheMisses()) ;
@@ -46,7 +46,7 @@ public class TestCacheStats extends Base
     @Test public void stats_02()
     {
         cache.clear() ;
-        cache = new CacheStatsAtomic<Integer, Integer>(cache) ;
+        cache = new CacheStatsAtomic<>(cache) ;
         CacheStats<Integer, Integer> cs = (CacheStats<Integer, Integer>)cache ;
         cache.put(7,77) ;
         assertEquals(1,cs.getCacheEntries()) ;
@@ -59,7 +59,7 @@ public class TestCacheStats extends Base
     @Test public void stats_03()
     {
         cache.clear() ;
-        cache = new CacheStatsAtomic<Integer, Integer>(cache) ;
+        cache = new CacheStatsAtomic<>(cache) ;
         CacheStats<Integer, Integer> cs = (CacheStats<Integer, Integer>)cache ;
         cache.put(7,77) ;
         cache.put(8,88) ;
@@ -73,7 +73,7 @@ public class TestCacheStats extends Base
     @Test public void stats_04()
     {
         cache.clear() ;
-        cache = new CacheStatsAtomic<Integer, Integer>(cache) ;
+        cache = new CacheStatsAtomic<>(cache) ;
         CacheStats<Integer, Integer> cs = (CacheStats<Integer, Integer>)cache ;
         cache.put(7,77) ;
         cache.get(7) ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java Tue Jun 24 09:06:50 2014
@@ -47,7 +47,7 @@ public class TestListUtils extends BaseT
 
     @Test public void list03() 
     {
-        List<Integer> x = new ArrayList<Integer>() ;
+        List<Integer> x = new ArrayList<>() ;
         x = unique(x) ;
         assertEquals(0, x.size()) ;
         test(x) ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestMultiSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestMultiSet.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestMultiSet.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestMultiSet.java Tue Jun 24 09:06:50 2014
@@ -32,14 +32,14 @@ public class TestMultiSet extends BaseTe
 {
     @Test public void multiSet_01()
     {
-        MultiSet<String> x = new MultiSet<String>() ;
+        MultiSet<String> x = new MultiSet<>() ;
         assertTrue(x.isEmpty()) ;
         assertEquals(0, x.count("A")) ;
     }
 
     @Test public void multiSet_02()
     {
-        MultiSet<String> x = new MultiSet<String>() ;
+        MultiSet<String> x = new MultiSet<>() ;
         x.add("A") ;
         assertFalse(x.isEmpty()) ;
         assertEquals(1, x.count("A") ) ;
@@ -49,7 +49,7 @@ public class TestMultiSet extends BaseTe
 
     @Test public void multiSet_03()
     {
-        MultiSet<String> x = new MultiSet<String>() ;
+        MultiSet<String> x = new MultiSet<>() ;
         x.add("A") ;
         x.add("A") ;
         x.remove("A") ;
@@ -122,7 +122,7 @@ public class TestMultiSet extends BaseTe
     
     private static MultiSet<String> add(String[] data)
     {
-        MultiSet<String> x = new MultiSet<String>() ;
+        MultiSet<String> x = new MultiSet<>() ;
         for ( String str : data )
             x.add(str) ;
         return x ;
@@ -131,7 +131,7 @@ public class TestMultiSet extends BaseTe
     private static void iterTest(String[] data)
     {
         List<String> expected = Arrays.asList(data) ;
-        MultiSet<String> x = new MultiSet<String>() ;
+        MultiSet<String> x = new MultiSet<>() ;
         for ( String str : data )
             x.add(str) ;
         List<String> actual = Iter.toList(x.iterator()) ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestReverseComparator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestReverseComparator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestReverseComparator.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestReverseComparator.java Tue Jun 24 09:06:50 2014
@@ -40,7 +40,7 @@ public class TestReverseComparator exten
         }
     };
     
-    static Comparator<String> reverse = new ReverseComparator<String>(normal);
+    static Comparator<String> reverse = new ReverseComparator<>(normal);
     
     
     static Comparator<String> maxMin = new Comparator<String>()
@@ -58,14 +58,14 @@ public class TestReverseComparator exten
         }
     };
     
-    static Comparator<String> reverseMaxMin = new ReverseComparator<String>(maxMin);
+    static Comparator<String> reverseMaxMin = new ReverseComparator<>(maxMin);
     
     static List<String> items = Arrays.asList("a", "b", "c", "d");
     static List<String> itemsReverse = Arrays.asList("d", "c", "b", "a");
     
     @Test public void reverse_01()
     {
-        List<String> modified = new ArrayList<String>(items);
+        List<String> modified = new ArrayList<>(items);
         Collections.sort(modified, reverse);
         
         test(itemsReverse, modified);
@@ -73,7 +73,7 @@ public class TestReverseComparator exten
     
     @Test public void reverse_02()
     {
-        List<String> modified = new ArrayList<String>(items);
+        List<String> modified = new ArrayList<>(items);
         Collections.sort(modified, reverseMaxMin);
         
         test(itemsReverse, modified);

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java Tue Jun 24 09:06:50 2014
@@ -130,15 +130,17 @@ public class TestSetUtils extends BaseTe
     
     private static Set<Integer> set(int... values)
     {
-        return new HashSet<Integer>(asList(values)) ;
+        return new HashSet<>(asList(values)) ;
     }
 
     private void test(Set<Integer> x, int...values)
     {
         List<Integer> y = asList(values) ;
         assertEquals(y.size(), x.size()) ;
-        
-        for ( int i = 0; i < y.size() ; i++ )
-            assertTrue(x.contains(y.get(i))) ; 
+
+        for ( Integer aY : y )
+        {
+            assertTrue( x.contains( aY ) );
+        }
     }
 }

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestTrie.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestTrie.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestTrie.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/atlas/lib/TestTrie.java Tue Jun 24 09:06:50 2014
@@ -34,7 +34,7 @@ public class TestTrie {
      */
     @Test
     public void trie_add_01() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         Assert.assertTrue(trie.contains("test"));
         Assert.assertEquals((Integer) 123, trie.get("test"));
@@ -45,7 +45,7 @@ public class TestTrie {
      */
     @Test
     public void trie_add_02() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("other", 456);
         Assert.assertTrue(trie.contains("test"));
@@ -59,7 +59,7 @@ public class TestTrie {
      */
     @Test
     public void trie_add_03() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("test", 456);
         Assert.assertTrue(trie.contains("test"));
@@ -71,7 +71,7 @@ public class TestTrie {
      */
     @Test
     public void trie_add_04() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", null);
         Assert.assertFalse(trie.contains("test"));
     }
@@ -81,7 +81,7 @@ public class TestTrie {
      */
     @Test
     public void trie_add_05() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add(null, 123);
         Assert.assertTrue(trie.contains(null));
         Assert.assertEquals((Integer)123, trie.get(null));
@@ -92,7 +92,7 @@ public class TestTrie {
      */
     @Test
     public void trie_add_06() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("", 123);
         Assert.assertTrue(trie.contains(""));
         Assert.assertEquals((Integer)123, trie.get(""));
@@ -103,7 +103,7 @@ public class TestTrie {
      */
     @Test
     public void trie_contains_01() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         Assert.assertFalse(trie.contains("test"));
     }
 
@@ -112,7 +112,7 @@ public class TestTrie {
      */
     @Test
     public void trie_contains_02() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         Assert.assertTrue(trie.contains("test"));
         Assert.assertTrue(trie.contains("test", true));
@@ -129,7 +129,7 @@ public class TestTrie {
      */
     @Test
     public void trie_contains_03() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         Assert.assertFalse(trie.contains(null));
         Assert.assertTrue(trie.contains(null, false));
     }
@@ -139,7 +139,7 @@ public class TestTrie {
      */
     @Test
     public void trie_contains_04() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         Assert.assertFalse(trie.contains(""));
         Assert.assertTrue(trie.contains("", false));
     }
@@ -149,7 +149,7 @@ public class TestTrie {
      */
     @Test
     public void trie_remove_01() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         Assert.assertTrue(trie.contains("test"));
         Assert.assertEquals((Integer) 123, trie.get("test"));
@@ -167,7 +167,7 @@ public class TestTrie {
      */
     @Test
     public void trie_remove_02() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         Assert.assertTrue(trie.contains("test"));
@@ -191,7 +191,7 @@ public class TestTrie {
      */
     @Test
     public void trie_remove_03() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add(null, 123);
         Assert.assertTrue(trie.contains(null));
         Assert.assertEquals((Integer)123, trie.get(null));
@@ -205,7 +205,7 @@ public class TestTrie {
      */
     @Test
     public void trie_remove_04() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("", 123);
         Assert.assertTrue(trie.contains(""));
         Assert.assertEquals((Integer)123, trie.get(""));
@@ -219,7 +219,7 @@ public class TestTrie {
      */
     @Test
     public void trie_prefix_search_01() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         
@@ -245,7 +245,7 @@ public class TestTrie {
      */
     @Test
     public void trie_partial_search_01() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         
@@ -271,7 +271,7 @@ public class TestTrie {
      */
     @Test
     public void trie_longest_match_01() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         Assert.assertTrue(trie.contains("test"));
@@ -285,7 +285,7 @@ public class TestTrie {
      */
     @Test
     public void trie_longest_match_02() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         
@@ -297,7 +297,7 @@ public class TestTrie {
      */
     @Test
     public void trie_longest_match_03() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         trie.remove("testing");
@@ -310,7 +310,7 @@ public class TestTrie {
      */
     @Test
     public void trie_shortest_match_01() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         Assert.assertTrue(trie.contains("test"));
@@ -324,7 +324,7 @@ public class TestTrie {
      */
     @Test
     public void trie_shortest_match_02() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         
@@ -336,7 +336,7 @@ public class TestTrie {
      */
     @Test
     public void trie_shortest_match_03() {
-        Trie<Integer> trie = new Trie<Integer>();
+        Trie<Integer> trie = new Trie<>();
         trie.add("test", 123);
         trie.add("testing", 456);
         trie.remove("test");

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/common/TestIsoMatcher.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/common/TestIsoMatcher.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/common/TestIsoMatcher.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/common/TestIsoMatcher.java Tue Jun 24 09:06:50 2014
@@ -187,7 +187,7 @@ public class TestIsoMatcher extends Base
     private static Node[] T = new Node[0] ;
     private List<Tuple<Node>> tuples(String[] strings)
     {
-        List<Tuple<Node>> tuples = new ArrayList<Tuple<Node>>() ;
+        List<Tuple<Node>> tuples = new ArrayList<>() ;
         for ( String s : strings)
         {
             Item item = SSE.parse(s) ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/ErrorHandlerTestLib.java Tue Jun 24 09:06:50 2014
@@ -49,7 +49,7 @@ public class ErrorHandlerTestLib
     // Error handler that records messages
     public static class ErrorHandlerMsg implements ErrorHandler
     {
-        public List<String> msgs = new ArrayList<String>() ;
+        public List<String> msgs = new ArrayList<>() ;
     
         @Override
         public void warning(String message, long line, long col)

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/TestSyntaxDetermination.java Tue Jun 24 09:06:50 2014
@@ -37,7 +37,7 @@ public class TestSyntaxDetermination ext
     
     @Parameters(name = "{0} -- {1} {2} {3} {4}")
     public static Iterable<Object[]> data() {
-        List<Object[]> x = new ArrayList<Object[]>() ;
+        List<Object[]> x = new ArrayList<>() ;
         add(x, "Test-ext-ttl-1", "http://sparql.org/D.ttl",   "text/turtle",  Lang.TTL,     Lang.TTL) ;
         add(x, "Test-ext-ttl-2", "http://sparql.org/D.ttl",   "text/turtle",  Lang.RDFXML,  Lang.TTL) ;
         add(x, "Test-ext-ttl-3", "http://sparql.org/D.ttl",   "text/plain",   null,         Lang.TTL) ;

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestBlankNodeAllocator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestBlankNodeAllocator.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestBlankNodeAllocator.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestBlankNodeAllocator.java Tue Jun 24 09:06:50 2014
@@ -36,7 +36,7 @@ public class TestBlankNodeAllocator exte
     
     @Parameters(name = "{index}: {0}")
     public static Iterable<Object[]> data() {
-        List<Object[]> x = new ArrayList<Object[]>() ;
+        List<Object[]> x = new ArrayList<>() ;
         Factory fSeededHashAlloc = new Factory() {
             @Override public BlankNodeAllocator create() { return new BlankNodeAllocatorHash() ; }
             @Override public String toString() { return "SeededHash" ; }

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestCollectorStream.java Tue Jun 24 09:06:50 2014
@@ -17,7 +17,7 @@ import com.hp.hpl.jena.sparql.util.NodeF
 public class TestCollectorStream  {
 	
 	private List<Triple> writeTriples(StreamRDF out, int size) {
-		List<Triple> results = new ArrayList<Triple>();
+		List<Triple> results = new ArrayList<>();
 		out.start();
         for (int i = 1; i <= size; i++) {
             Triple t = new Triple(NodeFactory.createAnon(),
@@ -38,7 +38,7 @@ public class TestCollectorStream  {
 	}
 	
 	private List<Quad> writeQuads(StreamRDF out, int size) {
-		List<Quad> results = new ArrayList<Quad>();
+		List<Quad> results = new ArrayList<>();
 		out.start();
         for (int i = 1; i <= size; i++) {
         	Quad q = new Quad(NodeFactory.createURI("http://graph"),
@@ -60,7 +60,7 @@ public class TestCollectorStream  {
 	}
 	
 	private List<Tuple<Node>> writeTuples(StreamRDF out, int size) {
-		List<Tuple<Node>> results = new ArrayList<Tuple<Node>>();
+		List<Tuple<Node>> results = new ArrayList<>();
 		out.start();
         for (int i = 1; i <= size; i++) {
             Tuple<Node> t = Tuple.createTuple(NodeFactory.createURI("http://graph"),

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLabelToNode.java Tue Jun 24 09:06:50 2014
@@ -40,7 +40,7 @@ public class TestLabelToNode extends Bas
     
     @Parameters(name = "{index}: {0}")
     public static Iterable<Object[]> data() {
-        List<Object[]> x = new ArrayList<Object[]>() ;
+        List<Object[]> x = new ArrayList<>() ;
         LabelToNodeFactory fSyntaxLabels = new LabelToNodeFactory() {
             @Override public LabelToNode create() { return SyntaxLabels.createLabelToNode() ; }
             @Override public String toString() { return "SyntaxLabels.createLabelToNode" ; }

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLang.java Tue Jun 24 09:06:50 2014
@@ -110,7 +110,7 @@ public class TestLang extends BaseTest
     @Test
     public void testFileExtensionUnique()
     {
-        Map<String, Lang> exts = new HashMap<String, Lang>();
+        Map<String, Lang> exts = new HashMap<>();
         
         for (Lang lang1 : RDFLanguages.getRegisteredLanguages() )
         {

Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java?rev=1605034&r1=1605033&r2=1605034&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestNodeToLabel.java Tue Jun 24 09:06:50 2014
@@ -39,7 +39,7 @@ public class TestNodeToLabel extends Bas
     
     @Parameters(name = "{index}: {0}")
     public static Iterable<Object[]> data() {
-        List<Object[]> x = new ArrayList<Object[]>() ;
+        List<Object[]> x = new ArrayList<>() ;
         
         NodeToLabelFactory f0 = new NodeToLabelFactory() {
             @Override public NodeToLabel create() { return SyntaxLabels.createNodeToLabel() ; }



Mime
View raw message