Removing redundant type arguments
Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ca9021f9 Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ca9021f9 Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ca9021f9 Branch: refs/heads/master Commit: ca9021f9a3f29d474b4e0391d6c34034487c41f6 Parents: 26ca8ce Author: ajs6f <[email protected]> Authored: Sat Oct 8 16:11:04 2016 -0400 Committer: ajs6f <[email protected]> Committed: Sun Oct 30 14:12:31 2016 -0400 ---------------------------------------------------------------------- .../apache/jena/atlas/data/SortedDataBag.java | 2 +- .../java/org/apache/jena/riot/lang/LangCSV.java | 2 +- .../jena/riot/system/IteratorStreamRDFText.java | 4 +- .../optimize/TransformEliminateAssignments.java | 4 +- .../optimize/TransformRemoveAssignment.java | 2 +- .../sparql/engine/iterator/QueryIterTopN.java | 2 +- .../org/apache/jena/sparql/expr/ExprList.java | 4 +- .../jena/sparql/function/library/sprintf.java | 2 +- .../jena/sparql/path/eval/PathEngine1.java | 4 +- .../jena/sparql/path/eval/PathEngineN.java | 2 +- .../jena/sparql/path/eval/PathEngineSPARQL.java | 4 +- .../org/apache/jena/sparql/syntax/Template.java | 4 +- .../syntaxtransform/ElementTransformer.java | 2 +- .../syntaxtransform/UpdateTransformOps.java | 2 +- .../apache/jena/sparql/util/DatasetUtils.java | 2 +- .../iterator/TestSortedDataBagCancellation.java | 10 ++--- .../syntaxtransform/TestSyntaxTransform.java | 4 +- .../org/apache/jena/atlas/lib/CacheFactory.java | 2 +- .../apache/jena/atlas/lib/RefCountingMap.java | 4 +- .../jena/atlas/lib/cache/CacheSetImpl.java | 2 +- .../jena/atlas/lib/TestRefCountingMap.java | 2 +- .../arq/querybuilder/AbstractQueryBuilder.java | 2 +- .../handlers/AggregationHandler.java | 2 +- .../querybuilder/handlers/ConstructHandler.java | 2 +- .../rewriters/AbstractRewriter.java | 6 +-- .../querybuilder/rewriters/ExprRewriter.java | 2 +- .../arq/querybuilder/rewriters/OpRewriter.java | 6 +-- .../querybuilder/clauses/PrologClauseTest.java | 2 +- .../handlers/ConstructHandlerTest.java | 2 +- .../handlers/DatasetHandlerTest.java | 6 +-- .../handlers/PrologHandlerTest.java | 4 +- .../handlers/SolutionModifierHandlerTest.java | 6 +-- .../querybuilder/handlers/WhereHandlerTest.java | 10 ++--- .../apache/jena/fuseki/server/CounterSet.java | 2 +- .../apache/jena/fuseki/server/DatasetRef.java | 4 +- .../apache/jena/fuseki/server/FusekiConfig.java | 2 +- .../apache/jena/fuseki/server/SPARQLServer.java | 2 +- .../apache/jena/fuseki/server/ServiceRef.java | 2 +- .../apache/jena/fuseki/servlets/HttpAction.java | 2 +- .../jena/fuseki/servlets/ResponseModel.java | 2 +- .../jena/fuseki/servlets/ResponseResultSet.java | 2 +- .../jena/fuseki/build/RefCountingMap.java | 4 +- .../fuseki/migrate/DatasetGraphSwitchable.java | 2 +- .../apache/jena/fuseki/server/FusekiServer.java | 2 +- .../jena/fuseki/servlets/CrossOriginFilter.java | 8 ++-- .../jena/fuseki/servlets/ResponseDataset.java | 2 +- .../java/org/apache/jena/fuseki/FileSender.java | 2 +- .../java/org/apache/jena/jdbc/JenaDriver.java | 16 ++++---- .../jdbc/connections/DatasetConnection.java | 4 +- .../jena/jdbc/connections/JenaConnection.java | 6 +-- .../jdbc/results/MaterializedSelectResults.java | 6 +-- .../apache/jena/jdbc/results/SelectResults.java | 2 +- .../jena/jdbc/results/TripleListResults.java | 2 +- .../metadata/AbstractResultsMetadata.java | 4 +- .../jena/jdbc/statements/JenaStatement.java | 6 +-- .../apache/jena/jdbc/utils/JdbcNodeUtils.java | 2 +- .../metadata/TestDatasetConnectionMetadata.java | 2 +- .../jena/jdbc/remote/RemoteEndpointDriver.java | 4 +- ...stRemoteEndpointConnectionWithGraphUris.java | 6 +-- .../metadata/TestRemoteConnectionMetadata.java | 2 +- .../tdb/metadata/TestTdbConnectionMetadata.java | 2 +- .../jena/permissions/SecurityEvaluator.java | 2 +- .../permissions/SecurityEvaluatorAssembler.java | 2 +- .../graph/SecuredGraphEventManager.java | 8 ++-- .../jena/permissions/graph/impl/Factory.java | 6 +-- .../jena/permissions/impl/ItemHolder.java | 2 +- .../jena/permissions/impl/SecuredItemImpl.java | 8 ++-- .../permissions/model/impl/SecuredAltImpl.java | 2 +- .../permissions/model/impl/SecuredBagImpl.java | 2 +- .../model/impl/SecuredContainerImpl.java | 10 ++--- .../model/impl/SecuredLiteralImpl.java | 2 +- .../model/impl/SecuredModelImpl.java | 16 ++++---- .../model/impl/SecuredNodeIterator.java | 2 +- .../model/impl/SecuredPropertyImpl.java | 2 +- .../model/impl/SecuredRDFListImpl.java | 16 ++++---- .../model/impl/SecuredReifiedStatementImpl.java | 2 +- .../model/impl/SecuredResourceImpl.java | 2 +- .../permissions/model/impl/SecuredSeqImpl.java | 2 +- .../model/impl/SecuredStatementImpl.java | 2 +- .../permissions/query/rewriter/OpRewriter.java | 4 +- .../SecurityEvaluatorParameters.java | 4 +- .../contract/model/ModelTestSuite.java | 2 +- .../permissions/model/SecuredModelTest.java | 2 +- .../permissions/model/SecuredRDFListTest.java | 6 +-- .../jena/query/spatial/DistanceUnitsUtils.java | 2 +- .../jena/query/spatial/EntityDefinition.java | 10 ++--- .../jena/query/spatial/SpatialIndexContext.java | 4 +- .../jena/query/spatial/SpatialIndexLucene.java | 2 +- .../jena/query/spatial/SpatialIndexSolr.java | 2 +- .../AbstractTestIndexingSpatialData.java | 4 +- .../TestTDBDatasetWithLuceneSpatialIndex.java | 4 +- .../spatial/pfunction/AbstractTestEastPF.java | 12 +++--- .../pfunction/AbstractTestIntersectsBoxPF.java | 12 +++--- .../pfunction/AbstractTestIsNearByPF.java | 42 ++++++++++---------- .../pfunction/AbstractTestIsWithinBoxPF.java | 12 +++--- .../pfunction/AbstractTestIsWithinCirclePF.java | 42 ++++++++++---------- .../spatial/pfunction/AbstractTestNorthPF.java | 12 +++--- .../spatial/pfunction/AbstractTestSouthPF.java | 12 +++--- .../spatial/pfunction/AbstractTestWestPF.java | 12 +++--- .../jena/query/text/DatasetGraphText.java | 2 +- .../apache/jena/query/text/TextIndexLucene.java | 2 +- ...tasetWithLuceneTextIndexDeletionSupport.java | 4 +- .../text/TestLuceneWithMultipleThreads.java | 2 +- 103 files changed, 258 insertions(+), 260 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java index 1728129..a9d2682 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/SortedDataBag.java @@ -85,7 +85,7 @@ public class SortedDataBag<E> extends AbstractDataBag<E> { Comparator<? super E> comparator) { this.policy = policy; this.serializationFactory = serializerFactory; - this.comparator = new AbortableComparator<E>(comparator); + this.comparator = new AbortableComparator<>(comparator); } /** http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java index a5c9bfc..fa10411 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java @@ -87,7 +87,7 @@ public class LangCSV implements LangRIOT { sink.start(); CSVParser parser = (input != null) ? CSVParser.create(input) : CSVParser.create(reader); - ArrayList<Node> predicates = new ArrayList<Node>(); + ArrayList<Node> predicates = new ArrayList<>(); int rowNum = 0; for (List<String> row : parser) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java index 6a0ae98..e0fe4b8 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java @@ -112,7 +112,7 @@ public class IteratorStreamRDFText extends IteratorStreamRDF implements Iterator private boolean finished = false ; private final Tokenizer tokens ; private List<Token> list ; - private Map<String, String> map = new HashMap<String, String>() ; + private Map<String, String> map = new HashMap<>() ; private String label ; public TokenInputStream(String label, Tokenizer tokens) { @@ -146,7 +146,7 @@ public class IteratorStreamRDFText extends IteratorStreamRDF implements Iterator } private List<Token> buildOneLine() { - List<Token> tuple = new ArrayList<Token>() ; + List<Token> tuple = new ArrayList<>() ; boolean isDirective = false ; for (; tokens.hasNext();) { Token token = tokens.next() ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java index 162b5cd..d1e12c7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformEliminateAssignments.java @@ -226,7 +226,7 @@ public class TransformEliminateAssignments extends TransformCopy { Expr currExpr = opExtend.getVarExprList().getExpr(assignVar); // See what vars are used in the current expression - Set<Var> vars = new HashSet<Var>(); + Set<Var> vars = new HashSet<>(); ExprVars.nonOpVarsMentioned(vars, currExpr); // See if we can inline anything @@ -433,7 +433,7 @@ public class TransformEliminateAssignments extends TransformCopy { } private List<ExprAggregator> processAggregators(List<ExprAggregator> aggs, ExprTransform transform) { - List<ExprAggregator> newAggs = new ArrayList<ExprAggregator>(); + List<ExprAggregator> newAggs = new ArrayList<>(); for (ExprAggregator agg : aggs) { ExprAggregator e2 = (ExprAggregator) ExprTransformer.transform(transform, agg); newAggs.add(e2); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java index aa63aca..d4d3fb7 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformRemoveAssignment.java @@ -128,7 +128,7 @@ public class TransformRemoveAssignment extends TransformCopy { if (!opProject.getVars().contains(this.var)) return super.transform(opProject, subOp); - List<Var> newVars = new ArrayList<Var>(opProject.getVars()); + List<Var> newVars = new ArrayList<>(opProject.getVars()); newVars.remove(this.var); if (this.topmostOnly) { if (this.aboveExtend) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java index f5a39a9..3bd8a67 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterTopN.java @@ -74,7 +74,7 @@ public class QueryIterTopN extends QueryIterPlainWrapper } // Keep heap with maximum accessible. - this.heap = new PriorityQueue<Binding>((int)numItems, new ReverseComparator<Binding>(comparator)) ; + this.heap = new PriorityQueue<>((int)numItems, new ReverseComparator<>(comparator)) ; this.setIterator(sortTopN(qIter, comparator)) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java index 297958c..51382ff 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/expr/ExprList.java @@ -43,7 +43,7 @@ public class ExprList implements Iterable<Expr> /** Empty, immutable ExprList */ public static final ExprList emptyList = new ExprList(Collections.emptyList()) ; - public ExprList() { expressions = new ArrayList<Expr>() ; } + public ExprList() { expressions = new ArrayList<>() ; } private ExprList(ExprList other) { this() ; @@ -72,7 +72,7 @@ public class ExprList implements Iterable<Expr> public ExprList tail(int fromIdx) { return subList(fromIdx, expressions.size()) ; } public Set<Var> getVarsMentioned() { - Set<Var> x = new HashSet<Var>() ; + Set<Var> x = new HashSet<>() ; varsMentioned(x) ; return x ; } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/function/library/sprintf.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/sprintf.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/sprintf.java index a0e29ac..769e794 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/library/sprintf.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/library/sprintf.java @@ -48,7 +48,7 @@ public class sprintf extends FunctionBase args.size()+" : [wanted at least 2]") ; NodeValue v1 = args.get(0) ; - List<NodeValue> allArgs = new ArrayList<NodeValue>(); + List<NodeValue> allArgs = new ArrayList<>(); for(int i = 1;i < args.size();i++) allArgs.add(args.get(i)); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java index 96da862..bc31386 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngine1.java @@ -45,11 +45,11 @@ final class PathEngine1 extends PathEngine } protected Collection<Node> collector() { - return new HashSet<Node>() ; + return new HashSet<>() ; } protected Set<Node> visitedAcc() { - return new HashSet<Node>() ; + return new HashSet<>() ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineN.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineN.java b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineN.java index 85859f7..34ec9a6 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineN.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineN.java @@ -48,7 +48,7 @@ final class PathEngineN extends PathEngine } protected Set<Node> visitedAcc() { - return new HashSet<Node>() ; + return new HashSet<>() ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java index aad333f..72ab795 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/path/eval/PathEngineSPARQL.java @@ -44,11 +44,11 @@ public class PathEngineSPARQL extends PathEngine } protected Collection<Node> collector() { - return new HashSet<Node>() ; + return new HashSet<>() ; } protected Set<Node> visitedAcc() { - return new HashSet<Node>() ; + return new HashSet<>() ; } @Override http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java index 641ceb7..9131c0f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/Template.java @@ -91,7 +91,7 @@ public class Template if(this.bgp != null){ return this.bgp.getList(); } - List<Triple> triples = new ArrayList<Triple>(); + List<Triple> triples = new ArrayList<>(); for(Quad q: qp.getQuads()){ if (Quad.defaultGraphNodeGenerated.equals(q.getGraph())) triples.add(q.asTriple()); @@ -100,7 +100,7 @@ public class Template } public List<Quad> getQuads() { if( this.bgp != null){ - List<Quad> quads = new ArrayList<Quad>(); + List<Quad> quads = new ArrayList<>(); for(Triple triple: this.bgp.getList()){ quads.add( new Quad( Quad.defaultGraphNodeGenerated, triple ) ); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java index 4a741e4..a1d1c9c 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/ElementTransformer.java @@ -97,7 +97,7 @@ public class ElementTransformer { protected final ElementTransform transform ; private final ExprTransform exprTransform ; - private final Deque<Element> stack = new ArrayDeque<Element>() ; + private final Deque<Element> stack = new ArrayDeque<>() ; protected final Element pop() { return stack.pop() ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/UpdateTransformOps.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/UpdateTransformOps.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/UpdateTransformOps.java index 348e947..a032b1b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/UpdateTransformOps.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/syntaxtransform/UpdateTransformOps.java @@ -162,7 +162,7 @@ public class UpdateTransformOps { } public List<Quad> transform(List<Quad> quads) { - List<Quad> x = new ArrayList<Quad>() ; + List<Quad> x = new ArrayList<>() ; boolean changed = false ; for (Quad q : quads) { Quad q1 = transform(q) ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java b/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java index 726e96a..851732b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/util/DatasetUtils.java @@ -140,7 +140,7 @@ public class DatasetUtils } public static DatasetGraph createDatasetGraph(String uri, List<String> namedSourceList, String baseURI) { - List<String> uriList = new ArrayList<String>(); + List<String> uriList = new ArrayList<>(); uriList.add(uri); return createDatasetGraph(uriList, namedSourceList, baseURI); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java index 2acf7ae..2d77ccf 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/TestSortedDataBagCancellation.java @@ -83,7 +83,7 @@ public class TestSortedDataBagCancellation extends TestCase { final DatasetGraph dataset = DatasetGraphFactory.create(); - final List<SortCondition> conditions = new ArrayList<SortCondition>(); + final List<SortCondition> conditions = new ArrayList<>(); final ExecutionContext ec = new ExecutionContext(params, activeGraph, dataset, factory); @@ -110,7 +110,7 @@ public class TestSortedDataBagCancellation extends TestCase { public void testIteratesToCompletion() { int count = 0; assertEquals(0, count = bc.count); - Set<Binding> results = new HashSet<Binding>(); + Set<Binding> results = new HashSet<>(); assertTrue(qs.hasNext()); assertTrue(bc.count >= count); @@ -134,7 +134,7 @@ public class TestSortedDataBagCancellation extends TestCase { assertFalse(qs.hasNext()); - Set<Binding> expected = new HashSet<Binding>(); + Set<Binding> expected = new HashSet<>(); expected.add(b1); expected.add(b2); expected.add(b3); @@ -152,7 +152,7 @@ public class TestSortedDataBagCancellation extends TestCase { public void testIteratesWithCancellation() { int count = 0; assertEquals(0, count = bc.count); - Set<Binding> results = new HashSet<Binding>(); + Set<Binding> results = new HashSet<>(); assertTrue(qs.hasNext()); assertTrue(bc.count >= count); @@ -175,7 +175,7 @@ public class TestSortedDataBagCancellation extends TestCase { * A QueryIterator that delivers the elements of a list of bindings. */ private static final class QueryIteratorItems extends QueryIteratorBase { - List<Binding> bindings = new ArrayList<Binding>(); + List<Binding> bindings = new ArrayList<>(); int index = 0; @Override http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java index f5910c8..d43dc45 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/syntax/syntaxtransform/TestSyntaxTransform.java @@ -129,7 +129,7 @@ public class TestSyntaxTransform extends BaseTest Query q1 = QueryFactory.create(PREFIX+input) ; Query qExpected = QueryFactory.create(PREFIX+output) ; - Map<Var, Node> map = new HashMap<Var, Node>() ; + Map<Var, Node> map = new HashMap<>() ; map.put(Var.alloc(varStr), SSE.parseNode(valStr)) ; Query qTrans = QueryTransformOps.transform(q1, map) ; @@ -141,7 +141,7 @@ public class TestSyntaxTransform extends BaseTest UpdateRequest req1 = UpdateFactory.create(PREFIX+input) ; UpdateRequest reqExpected = UpdateFactory.create(PREFIX+output) ; - Map<Var, Node> map = new HashMap<Var, Node>() ; + Map<Var, Node> map = new HashMap<>() ; map.put(Var.alloc(varStr), SSE.parseNode(valStr)) ; UpdateRequest reqTrans = UpdateTransformOps.transform(req1, map) ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java index e913a9d..411f67e 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/CacheFactory.java @@ -54,7 +54,7 @@ public class CacheFactory { */ public static <Obj> CacheSet<Obj> createCacheSet(int size) { Cache<Obj, Object> c = createCache(size) ; - return new CacheSetImpl<Obj>(c) ; + return new CacheSetImpl<>(c) ; } /** Add a synchronization wrapper to an existing set-cache */ http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java index 7aa5e23..4cfe37d 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/RefCountingMap.java @@ -96,7 +96,7 @@ public class RefCountingMap<K, T> { if (v != null && ( v.getRef().equals(value) ) ) { refCount = v.getCount() + 1; } - return new CountedRef<T>(value, refCount ); + return new CountedRef<>(value, refCount ); }); } @@ -119,7 +119,7 @@ public class RefCountingMap<K, T> { if ( refCount == 0 ) return null ; else - return new CountedRef<T>(v.getRef(), refCount); + return new CountedRef<>(v.getRef(), refCount); }); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSetImpl.java ---------------------------------------------------------------------- diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSetImpl.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSetImpl.java index 9f42af8..9474c0f 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSetImpl.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/cache/CacheSetImpl.java @@ -39,7 +39,7 @@ public class CacheSetImpl<T> implements CacheSet<T> { /** Callback for entries when dropped from the cache */ @Override public void setDropHandler(Consumer<T> dropHandler) { - cacheMap.setDropHandler(new Wrapper<T>(dropHandler)) ; + cacheMap.setDropHandler(new Wrapper<>(dropHandler)) ; } // From map action to set action. http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java ---------------------------------------------------------------------- diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java index 3bc32c3..3665875 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestRefCountingMap.java @@ -28,7 +28,7 @@ public class TestRefCountingMap { private static final String value1 = "value1"; private static final String value1_1 = "value1_1"; - private final RefCountingMap<String,String> map = new RefCountingMap<String, String>(); + private final RefCountingMap<String,String> map = new RefCountingMap<>(); public TestRefCountingMap() {} @Test http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java index 2e25990..bc1fc95 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/AbstractQueryBuilder.java @@ -199,7 +199,7 @@ public abstract class AbstractQueryBuilder<T extends AbstractQueryBuilder<T>> */ protected AbstractQueryBuilder() { query = new Query(); - values = new HashMap<Var, Node>(); + values = new HashMap<>(); } /** http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java index f999ca8..208a800 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/AggregationHandler.java @@ -43,7 +43,7 @@ public class AggregationHandler implements Handler { public AggregationHandler( Query query ) { this.query = query; - aggMap = new HashMap<Var,ExprAggregator>(); + aggMap = new HashMap<>(); } /** http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java index 0c43990..f9688b8 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandler.java @@ -43,7 +43,7 @@ public class ConstructHandler implements Handler { */ public ConstructHandler(Query query) { this.query = query; - constructs = new ArrayList<Triple>(); + constructs = new ArrayList<>(); if (query.getConstructTemplate() != null) { for (Triple t : query.getConstructTemplate().getTriples()) { constructs.add(t); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java index 6e36272..0af74db 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/AbstractRewriter.java @@ -44,7 +44,7 @@ public class AbstractRewriter<T> { // The map of variables to nodes. protected final Map<Var, Node> values; // A stack used in processing. - private final Stack<T> result = new Stack<T>(); + private final Stack<T> result = new Stack<>(); /** * Constructor @@ -140,7 +140,7 @@ public class AbstractRewriter<T> { * @return The list of nodes. */ protected final List<Node> changeNodes(List<Node> src) { - List<Node> lst = new ArrayList<Node>(); + List<Node> lst = new ArrayList<>(); for (Node t : src) { lst.add(changeNode(t)); } @@ -153,7 +153,7 @@ public class AbstractRewriter<T> { * @return The list of rewritten triples. */ public final List<Triple> rewrite(List<Triple> src) { - List<Triple> lst = new ArrayList<Triple>(); + List<Triple> lst = new ArrayList<>(); for (Triple t : src) { lst.add(rewrite(t)); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java index 2487c9b..d928cf3 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/ExprRewriter.java @@ -153,7 +153,7 @@ public class ExprRewriter extends AbstractRewriter<Expr> implements ExprVisitor if (lst == null) { return null; } - List<SortCondition> retval = new ArrayList<SortCondition>(); + List<SortCondition> retval = new ArrayList<>(); for (SortCondition sc : lst) { retval.add(rewrite(sc)); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java index fba3039..28bc58c 100644 --- a/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java +++ b/jena-extras/jena-querybuilder/src/main/java/org/apache/jena/arq/querybuilder/rewriters/OpRewriter.java @@ -63,7 +63,7 @@ class OpRewriter extends AbstractRewriter<Op> implements OpVisitor { } private List<Op> rewriteOpList(List<Op> lst) { - List<Op> retval = new ArrayList<Op>(); + List<Op> retval = new ArrayList<>(); for (Op o : lst) { o.visit(this); retval.add(pop()); @@ -282,7 +282,7 @@ class OpRewriter extends AbstractRewriter<Op> implements OpVisitor { @Override public void visit(OpProject opProject) { opProject.getSubOp().visit(this); - List<Var> vars = new ArrayList<Var>(); + List<Var> vars = new ArrayList<>(); for (Var v : opProject.getVars()) { Node n = changeNode(v); vars.add(Var.alloc(n)); @@ -313,7 +313,7 @@ class OpRewriter extends AbstractRewriter<Op> implements OpVisitor { opGroup.getSubOp().visit(this); ExprRewriter expRewriter = new ExprRewriter(values); VarExprList groupVars = rewrite(opGroup.getGroupVars()); - List<ExprAggregator> aggregators = new ArrayList<ExprAggregator>(); + List<ExprAggregator> aggregators = new ArrayList<>(); for (ExprAggregator ea : opGroup.getAggregators()) { ea.visit(expRewriter); aggregators.add((ExprAggregator) expRewriter.pop()); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/PrologClauseTest.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/PrologClauseTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/PrologClauseTest.java index 4885d04..758108c 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/PrologClauseTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/clauses/PrologClauseTest.java @@ -92,7 +92,7 @@ public class PrologClauseTest<T extends PrologClause<?>> extends @ContractTest public void testAddPrefixes() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("pfx", "uri"); map.put("pfx2", "uri2"); PrologClause<?> prologClause = getProducer().newInstance(); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java index f5893dc..47a49a4 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/ConstructHandlerTest.java @@ -80,7 +80,7 @@ public class ConstructHandlerTest extends AbstractHandlerTest { assertEquals(1, lst.size()); assertEquals(t, lst.get(0)); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, NodeFactory.createURI("three")); handler.setVars(values); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java index 3f74ac7..8a730bf 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/DatasetHandlerTest.java @@ -83,7 +83,7 @@ public class DatasetHandlerTest extends AbstractHandlerTest { @Test public void setVarsFromNamed() { - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); handler.fromNamed("?foo"); handler.from("?bar"); values.put(Var.alloc("foo"), @@ -96,7 +96,7 @@ public class DatasetHandlerTest extends AbstractHandlerTest { @Test public void setVarsFrom() { - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); handler.fromNamed("?foo"); handler.from("?bar"); values.put(Var.alloc("bar"), @@ -109,7 +109,7 @@ public class DatasetHandlerTest extends AbstractHandlerTest { @Test public void setVarsBoth() { - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); handler.fromNamed("?foo"); handler.from("?bar"); values.put(Var.alloc("bar"), http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java index a63a59a..9d19f62 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/PrologHandlerTest.java @@ -61,7 +61,7 @@ public class PrologHandlerTest extends AbstractHandlerTest { @Test public void testAddPrefixes() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("pfx", "uri"); map.put("pfx2", "uri2"); handler.addPrefixes(map); @@ -72,7 +72,7 @@ public class PrologHandlerTest extends AbstractHandlerTest { @Test public void testAddPrefixesWithColon() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("pfx:", "uri"); map.put("pfx2", "uri2"); handler.addPrefixes(map); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java index 62bad25..4ebfab3 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/SolutionModifierHandlerTest.java @@ -198,7 +198,7 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest { String[] s = byLine(query.toString()); assertContainsRegex(GROUP_BY + var("v"), s); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, Var.alloc("v2")); solutionModifier.setVars(values); s = byLine(query.toString()); @@ -213,7 +213,7 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest { String[] s = byLine(query.toString()); assertContainsRegex(HAVING + var("v"), s); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, Var.alloc("v2")); solutionModifier.setVars(values); s = byLine(query.toString()); @@ -228,7 +228,7 @@ public class SolutionModifierHandlerTest extends AbstractHandlerTest { String[] s = byLine(query.toString()); assertContainsRegex(ORDER_BY + var("v"), s); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, Var.alloc("v2")); solutionModifier.setVars(values); s = byLine(query.toString()); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java ---------------------------------------------------------------------- diff --git a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java index 97536e9..8a7dda9 100644 --- a/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java +++ b/jena-extras/jena-querybuilder/src/test/java/org/apache/jena/arq/querybuilder/handlers/WhereHandlerTest.java @@ -283,7 +283,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { assertContainsRegex( WHERE + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE + var("v") + OPT_SPACE + CLOSE_CURLY, query.toString()); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, NodeFactory.createURI("three")); handler.setVars(values); assertContainsRegex( @@ -296,7 +296,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { handler.addFilter("?one < ?v"); assertContainsRegex(WHERE + OPEN_CURLY + "FILTER" + OPT_SPACE + OPEN_PAREN + var("one") + OPT_SPACE + LT + OPT_SPACE + var("v") + CLOSE_PAREN + CLOSE_CURLY, query.toString()); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(Var.alloc("v"), NodeFactory.createLiteral(LiteralLabelFactory.createTypedLiteral(10))); handler.setVars(values); @@ -312,7 +312,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { handler.addOptional(new Triple(NodeFactory.createURI("one"), NodeFactory.createURI("two"), v)); assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE + OPEN_CURLY + uri("one") + SPACE + uri("two") + SPACE + var("v") + OPT_SPACE + CLOSE_CURLY + CLOSE_CURLY, query.toString()); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, NodeFactory.createURI("three")); handler.setVars(values); assertContainsRegex(WHERE + OPEN_CURLY + "OPTIONAL" + SPACE + OPEN_CURLY + uri("one") + SPACE + uri("two") @@ -327,7 +327,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { handler.addSubQuery(sb); assertContainsRegex(WHERE + OPEN_CURLY + uri("one") + ".+" + uri("two") + ".+" + var("v") + ".+" + CLOSE_CURLY, query.toString()); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, NodeFactory.createURI("three")); handler.setVars(values); assertContainsRegex( @@ -343,7 +343,7 @@ public class WhereHandlerTest extends AbstractHandlerTest { handler.addUnion(sb); assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY + uri("one") + ".+" + uri("two") + ".+" + var("v") + ".+" + CLOSE_CURLY, query.toString()); - Map<Var, Node> values = new HashMap<Var, Node>(); + Map<Var, Node> values = new HashMap<>(); values.put(v, NodeFactory.createURI("three")); handler.setVars(values); assertContainsRegex(WHERE + OPEN_CURLY + UNION + OPEN_CURLY + uri("one") + ".+" + uri("two") + ".+" http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/CounterSet.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/CounterSet.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/CounterSet.java index 7d0d622..9b8231e 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/CounterSet.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/CounterSet.java @@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory ; public class CounterSet { private static Logger log = LoggerFactory.getLogger(CounterSet.class) ; - private Map<CounterName, Counter> counters = new HashMap<CounterName, Counter>() ; + private Map<CounterName, Counter> counters = new HashMap<>() ; public CounterSet() {} http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java index 5722290..8225afe 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/DatasetRef.java @@ -41,8 +41,8 @@ public class DatasetRef implements DatasetMXBean, Counters @Override public CounterSet getCounters() { return counters ; } - private Map<String, ServiceRef> endpoints = new HashMap<String, ServiceRef>() ; - private List<ServiceRef> serviceRefs = new ArrayList<ServiceRef>() ; + private Map<String, ServiceRef> endpoints = new HashMap<>() ; + private List<ServiceRef> serviceRefs = new ArrayList<>() ; private boolean initialized = false ; // Two step initiation (c.f. Builder pattern) http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java index f0dd66e..84f6af4 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java @@ -122,7 +122,7 @@ public class FusekiConfig if ( ! rs.hasNext() ) log.warn("No services found") ; - List<DatasetRef> services = new ArrayList<DatasetRef>() ; + List<DatasetRef> services = new ArrayList<>() ; for ( ; rs.hasNext() ; ) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java index 2ab8db6..1dca6f0 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java @@ -244,7 +244,7 @@ public class SPARQLServer { if ( ! FileOps.exists(serverConfig.pages) ) serverLog.warn("No pages directory - "+serverConfig.pages) ; String base = serverConfig.pages ; - Map<String, Object> data = new HashMap<String, Object>() ; + Map<String, Object> data = new HashMap<>() ; data.put("mgt", new MgtFunctions()) ; SimpleVelocityServlet templateEngine = new SimpleVelocityServlet(base, data) ; addServlet(context, templateEngine, "*.tpl", false) ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/ServiceRef.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/ServiceRef.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/ServiceRef.java index 6236050..83b38ad 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/ServiceRef.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/server/ServiceRef.java @@ -32,7 +32,7 @@ public class ServiceRef implements ServiceMXBean, Counters public CounterSet getCounters() { return counters ; } /** Endpoints (as absolute path URLs) */ - public List<String> endpoints = new ArrayList<String>() ; + public List<String> endpoints = new ArrayList<>() ; // Attach counters to services or datasets // Can we have a counter of the same name on different services? http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java index 7934a29..a418972 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java @@ -72,7 +72,7 @@ public class HttpAction String contentType = null ; // Cleared to archive: - Map <String, String> headers = new HashMap<String, String>() ; + Map <String, String> headers = new HashMap<>() ; public HttpServletRequest request; public HttpServletResponseTracker response ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java index cbe3721..68bec96 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java @@ -55,7 +55,7 @@ public class ResponseModel private static final String contentOutputTTL = "ttl" ; private static final String contentOutputNT = "nt" ; - public static Map<String,String> shortNamesModel = new HashMap<String, String>() ; + public static Map<String,String> shortNamesModel = new HashMap<>() ; static { // Some short names. keys are lowercase. http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java ---------------------------------------------------------------------- diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java index 35daf70..69ee31b 100644 --- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java +++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java @@ -64,7 +64,7 @@ public class ResponseResultSet private static final String contentOutputTSV = "tsv" ; private static final String contentOutputThrift = "thrift" ; - public static Map<String,String> shortNamesResultSet = new HashMap<String, String>() ; + public static Map<String,String> shortNamesResultSet = new HashMap<>() ; static { // Some short names. keys are lowercase. ResponseOps.put(shortNamesResultSet, contentOutputJSON, WebContent.contentTypeResultsJSON) ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java index 7c5cdda..cfb0ebe 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/build/RefCountingMap.java @@ -96,7 +96,7 @@ public class RefCountingMap<K, T> { if (v != null && ( v.getRef().equals(value) ) ) { refCount = v.getCount() + 1; } - return new CountedRef<T>(value, refCount ); + return new CountedRef<>(value, refCount ); }); } @@ -119,7 +119,7 @@ public class RefCountingMap<K, T> { if ( refCount == 0 ) return null ; else - return new CountedRef<T>(v.getRef(), refCount); + return new CountedRef<>(v.getRef(), refCount); }); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java index a81fa44..76178eb 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/migrate/DatasetGraphSwitchable.java @@ -33,7 +33,7 @@ public class DatasetGraphSwitchable extends DatasetGraphWrapper { // Time to have DatasetGraph.getQueryDataset private final DatasetGraph dsg1 ; private final DatasetGraph dsg2 ; - private final AtomicReference<DatasetGraph> current = new AtomicReference<DatasetGraph>() ; + private final AtomicReference<DatasetGraph> current = new AtomicReference<>() ; // Change DatasetGraphWrapper to use protected get() http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java index 0e32f39..4cf74da 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java @@ -204,7 +204,7 @@ public class FusekiServer List<DataAccessPoint> directoryDBs = FusekiConfig.readConfigurationDirectory(configDir) ; List<DataAccessPoint> systemDBs = FusekiConfig.readSystemDatabase(SystemState.getDataset()) ; - List<DataAccessPoint> datapoints = new ArrayList<DataAccessPoint>() ; + List<DataAccessPoint> datapoints = new ArrayList<>() ; datapoints.addAll(configFileDBs) ; datapoints.addAll(directoryDBs) ; datapoints.addAll(systemDBs) ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java index f0e3b2f..7dd8832 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/CrossOriginFilter.java @@ -154,10 +154,10 @@ public class CrossOriginFilter implements Filter private static final List<String> SIMPLE_HTTP_METHODS = Arrays.asList("GET", /*"POST",*/ "HEAD"); private boolean anyOriginAllowed; - private List<String> allowedOrigins = new ArrayList<String>(); - private List<String> allowedMethods = new ArrayList<String>(); - private List<String> allowedHeaders = new ArrayList<String>(); - private List<String> exposedHeaders = new ArrayList<String>(); + private List<String> allowedOrigins = new ArrayList<>(); + private List<String> allowedMethods = new ArrayList<>(); + private List<String> allowedHeaders = new ArrayList<>(); + private List<String> exposedHeaders = new ArrayList<>(); private int preflightMaxAge; private boolean allowCredentials; private boolean chainPreflight; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java index 34d3495..0e6543b 100644 --- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java +++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ResponseDataset.java @@ -55,7 +55,7 @@ public class ResponseDataset private static final String contentOutputTriG = "trig" ; private static final String contentOutputNQuads = "n-quads" ; - public static Map<String,String> shortNamesModel = new HashMap<String, String>() ; + public static Map<String,String> shortNamesModel = new HashMap<>() ; static { // Some short names. keys are lowercase. ResponseOps.put(shortNamesModel, contentOutputJSONLD, contentTypeJSONLD) ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java ---------------------------------------------------------------------- diff --git a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java index e1292e7..f2b057e 100644 --- a/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java +++ b/jena-fuseki2/jena-fuseki-core/src/test/java/org/apache/jena/fuseki/FileSender.java @@ -45,7 +45,7 @@ public class FileSender { String contentType ; } - private List<Entry> items = new ArrayList<Entry>() ; + private List<Entry> items = new ArrayList<>() ; private String url ; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java index 20b7f25..be13215 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/JenaDriver.java @@ -333,7 +333,7 @@ public abstract class JenaDriver implements Driver { if (ppObj != null) { if (ppObj instanceof String) { // Single instance to try and register - preProcessors = new ArrayList<String>(); + preProcessors = new ArrayList<>(); preProcessors.add(ppObj.toString()); } else if (ppObj instanceof List<?>) { // Multiple instances to try and register @@ -438,7 +438,7 @@ public abstract class JenaDriver implements Driver { if (ppObj instanceof String) { // Single instance to try and register - postProcessors = new ArrayList<String>(); + postProcessors = new ArrayList<>(); postProcessors.add(ppObj.toString()); } else if (ppObj instanceof List<?>) { // Multiple instances to try and register @@ -608,7 +608,7 @@ public abstract class JenaDriver implements Driver { // Doesn't yet exist, add a string/list as appropriate if ( this.allowsMultipleValues( key ) ) { - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); if ( value.contains( "," ) ) { // Comma separated lists are usable for multiple value @@ -655,7 +655,7 @@ public abstract class JenaDriver implements Driver { else { // Convert to list - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); values.add( currValue.toString() ); if ( value.contains( "," ) ) { @@ -732,7 +732,7 @@ public abstract class JenaDriver implements Driver { ((List<Object>) currValue).add(value); } else { // Convert to list - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); values.add(currValue.toString()); values.add(value.toString()); target.put(key, values); @@ -872,7 +872,7 @@ public abstract class JenaDriver implements Driver { Properties ps = this.getEffectiveProperties(url, props); // Create base driver properties - List<DriverPropertyInfo> baseProps = new ArrayList<DriverPropertyInfo>(); + List<DriverPropertyInfo> baseProps = new ArrayList<>(); // JDBC compatibility level DriverPropertyInfo jdbcCompatLevel = new DriverPropertyInfo(PARAM_JDBC_COMPATIBILITY, ps.getProperty( @@ -958,11 +958,11 @@ public abstract class JenaDriver implements Driver { protected List<String> getValues(Properties props, String key) throws SQLException { Object obj = props.get(key); if (obj == null) - return new ArrayList<String>(); + return new ArrayList<>(); if (obj instanceof List<?>) return (List<String>) obj; if (obj instanceof String) { - List<String> values = new ArrayList<String>(); + List<String> values = new ArrayList<>(); values.add(obj.toString()); return values; } else { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/DatasetConnection.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/DatasetConnection.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/DatasetConnection.java index 2265d7f..ea1f48f 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/DatasetConnection.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/DatasetConnection.java @@ -40,8 +40,8 @@ public abstract class DatasetConnection extends JenaConnection { protected Dataset ds; private boolean readonly = false; - private ThreadLocal<ReadWrite> transactionType = new ThreadLocal<ReadWrite>(); - private ThreadLocal<Integer> transactionParticipants = new ThreadLocal<Integer>(); + private ThreadLocal<ReadWrite> transactionType = new ThreadLocal<>(); + private ThreadLocal<Integer> transactionParticipants = new ThreadLocal<>(); /** * Creates a new dataset connection http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java index c14ea85..91ae018 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/connections/JenaConnection.java @@ -103,9 +103,9 @@ public abstract class JenaConnection implements Connection { private boolean autoCommit = DEFAULT_AUTO_COMMIT; private int isolationLevel = DEFAULT_ISOLATION_LEVEL; private int compatibilityLevel = JdbcCompatibility.DEFAULT; - private List<Statement> statements = new ArrayList<Statement>(); - private List<CommandPreProcessor> preProcessors = new ArrayList<CommandPreProcessor>(); - private List<ResultsPostProcessor> postProcessors = new ArrayList<ResultsPostProcessor>(); + private List<Statement> statements = new ArrayList<>(); + private List<CommandPreProcessor> preProcessors = new ArrayList<>(); + private List<ResultsPostProcessor> postProcessors = new ArrayList<>(); /** * Creates a new connection http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/MaterializedSelectResults.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/MaterializedSelectResults.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/MaterializedSelectResults.java index 28e6bb2..ae00d20 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/MaterializedSelectResults.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/MaterializedSelectResults.java @@ -40,8 +40,8 @@ import org.apache.jena.sparql.engine.binding.Binding ; public class MaterializedSelectResults extends MaterializedResults<Binding> { private ResultSetRewindable innerResults; - private Stack<Binding> previousResults = new Stack<Binding>(); - private Stack<Binding> nextResults = new Stack<Binding>(); + private Stack<Binding> previousResults = new Stack<>(); + private Stack<Binding> nextResults = new Stack<>(); private List<String> columns; private SelectResultsMetadata metadata; @@ -65,7 +65,7 @@ public class MaterializedSelectResults extends MaterializedResults<Binding> { if (results == null) throw new SQLException("SPARQL Results cannot be null"); this.innerResults = results; - this.columns = new ArrayList<String>(this.innerResults.getResultVars()); + this.columns = new ArrayList<>(this.innerResults.getResultVars()); this.metadata = new SelectResultsMetadata(this, this.innerResults); this.innerResults.reset(); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/SelectResults.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/SelectResults.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/SelectResults.java index f8512ad..e499523 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/SelectResults.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/SelectResults.java @@ -64,7 +64,7 @@ public class SelectResults extends StreamedResults<Binding> { if (results == null) throw new SQLException("SPARQL Results cannot be null"); this.innerResults = results; - this.columns = new ArrayList<String>(this.innerResults.getResultVars()); + this.columns = new ArrayList<>(this.innerResults.getResultVars()); this.metadata = statement.getJenaConnection().applyPostProcessors(new SelectResultsMetadata(this, this.innerResults)); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java index bcb54e0..b429835 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/TripleListResults.java @@ -61,7 +61,7 @@ public class TripleListResults extends MaterializedResults<Triple> { throw new SQLException("Triple Iterator cannot be null"); this.triples = ts; this.metadata = statement.getJenaConnection().applyPostProcessors( - new TripleResultsMetadata(this, new PeekIterator<Triple>(ts.iterator()))); + new TripleResultsMetadata(this, new PeekIterator<>(ts.iterator()))); this.numColumns = this.metadata.getColumnCount(); this.subjColumn = this.metadata.getSubjectColumnLabel(); this.predColumn = this.metadata.getPredicateColumnLabel(); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/metadata/AbstractResultsMetadata.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/metadata/AbstractResultsMetadata.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/metadata/AbstractResultsMetadata.java index 436ef70..2eea3d4 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/metadata/AbstractResultsMetadata.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/results/metadata/AbstractResultsMetadata.java @@ -34,7 +34,7 @@ import org.apache.jena.jdbc.results.metadata.columns.ColumnInfo; public class AbstractResultsMetadata implements ResultSetMetaData { protected ResultSet results; - protected List<ColumnInfo> columns = new ArrayList<ColumnInfo>(); + protected List<ColumnInfo> columns = new ArrayList<>(); /** * Abstract implementation of result set metadata @@ -200,7 +200,7 @@ public class AbstractResultsMetadata implements ResultSetMetaData { * @return Column Information */ public List<ColumnInfo> getJenaColumnInfo() { - return new ArrayList<ColumnInfo>(this.columns); + return new ArrayList<>(this.columns); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java index ab249a9..3d4e0ee 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/statements/JenaStatement.java @@ -63,12 +63,12 @@ public abstract class JenaStatement implements Statement { protected static final int DEFAULT_TYPE = ResultSet.TYPE_FORWARD_ONLY; protected static final int USE_CONNECTION_COMPATIBILITY = Integer.MIN_VALUE; - private List<String> commands = new ArrayList<String>(); + private List<String> commands = new ArrayList<>(); private SQLWarning warnings = null; private JenaConnection connection; private ResultSet currResults = null; - private Queue<ResultSet> results = new LinkedList<ResultSet>(); - private List<ResultSet> openResults = new ArrayList<ResultSet>(); + private Queue<ResultSet> results = new LinkedList<>(); + private List<ResultSet> openResults = new ArrayList<>(); private boolean closed = false; private int type = DEFAULT_TYPE; private int fetchDirection = DEFAULT_FETCH_DIRECTION; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/utils/JdbcNodeUtils.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/utils/JdbcNodeUtils.java b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/utils/JdbcNodeUtils.java index 6adfa1a..2606c96 100644 --- a/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/utils/JdbcNodeUtils.java +++ b/jena-jdbc/jena-jdbc-core/src/main/java/org/apache/jena/jdbc/utils/JdbcNodeUtils.java @@ -38,7 +38,7 @@ import org.apache.jena.vocabulary.XSD ; */ public class JdbcNodeUtils { - private static Set<String> numericTypes = new HashSet<String>(); + private static Set<String> numericTypes = new HashSet<>(); static { numericTypes.add(XSD.decimal.getURI()); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/metadata/TestDatasetConnectionMetadata.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/metadata/TestDatasetConnectionMetadata.java b/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/metadata/TestDatasetConnectionMetadata.java index fa83881..e7325ee 100644 --- a/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/metadata/TestDatasetConnectionMetadata.java +++ b/jena-jdbc/jena-jdbc-driver-mem/src/test/java/org/apache/jena/jdbc/mem/metadata/TestDatasetConnectionMetadata.java @@ -53,7 +53,7 @@ public class TestDatasetConnectionMetadata extends AbstractDatabaseMetadataTests @Override protected List<Integer> getSupportedTransactionLevels() { - List<Integer> levels = new ArrayList<Integer>(); + List<Integer> levels = new ArrayList<>(); levels.add(Connection.TRANSACTION_NONE); if ( supportsSerializable ) levels.add(Connection.TRANSACTION_SERIALIZABLE); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java index 3729d97..021971d 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java @@ -333,7 +333,7 @@ public class RemoteEndpointDriver extends JenaDriver { * URI * @return Reduced URI or null if no further reduction is possible */ - private String stripLastComponent(String input) { + private static String stripLastComponent(String input) { try { URI uri = new URI(input); if (uri.getFragment() != null) { @@ -382,7 +382,7 @@ public class RemoteEndpointDriver extends JenaDriver { * @return URI with irrelevant components stripped off or null if stripping * is impossible */ - private String stripIrrelevantComponents(String input) { + private static String stripIrrelevantComponents(String input) { try { URI orig = new URI(input); return new URI(orig.getScheme(), orig.getUserInfo(), orig.getHost(), orig.getPort(), orig.getPath(), null, null) http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java index 21d73d2..3408975 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java @@ -57,7 +57,7 @@ public class TestRemoteEndpointConnectionWithGraphUris extends AbstractRemoteEnd @Override protected JenaConnection getConnection() throws SQLException { - List<String> defaultGraphs = new ArrayList<String>(); + List<String> defaultGraphs = new ArrayList<>(); defaultGraphs.add(DEFAULT_GRAPH_URI); return new RemoteEndpointConnection(ServerCtl.serviceQuery(), ServerCtl.serviceUpdate(), defaultGraphs, null, defaultGraphs, null, null, JenaConnection.DEFAULT_HOLDABILITY, JdbcCompatibility.DEFAULT, null, null); @@ -65,9 +65,9 @@ public class TestRemoteEndpointConnectionWithGraphUris extends AbstractRemoteEnd @Override protected JenaConnection getConnection(Dataset ds) throws SQLException { - List<String> defaultGraphs = new ArrayList<String>(); + List<String> defaultGraphs = new ArrayList<>(); defaultGraphs.add(DEFAULT_GRAPH_URI); - List<String> namedGraphs = new ArrayList<String>(); + List<String> namedGraphs = new ArrayList<>(); Iterator<String> names = ds.listNames(); while (names.hasNext()) { String name = names.next(); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java index bc83bbe..103a303 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java @@ -51,7 +51,7 @@ public class TestRemoteConnectionMetadata extends AbstractDatabaseMetadataTests @Override protected List<Integer> getSupportedTransactionLevels() { - List<Integer> levels = new ArrayList<Integer>(); + List<Integer> levels = new ArrayList<>(); levels.add(Connection.TRANSACTION_NONE); return levels; } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java b/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java index 5a080ed..0e2712b 100644 --- a/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java +++ b/jena-jdbc/jena-jdbc-driver-tdb/src/test/java/org/apache/jena/jdbc/tdb/metadata/TestTdbConnectionMetadata.java @@ -54,7 +54,7 @@ public class TestTdbConnectionMetadata extends AbstractDatabaseMetadataTests { @Override protected List<Integer> getSupportedTransactionLevels() { - List<Integer> levels = new ArrayList<Integer>(); + List<Integer> levels = new ArrayList<>(); levels.add(Connection.TRANSACTION_SERIALIZABLE); return levels; } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java index 1ee4d2a..1c86a7f 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluator.java @@ -144,7 +144,7 @@ public interface SecurityEvaluator { if (actions instanceof Set) { return (Set<Action>) actions; } else { - return new LinkedHashSet<Action>(actions); + return new LinkedHashSet<>(actions); } } } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java index e871b0a..7ef923f 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java @@ -126,7 +126,7 @@ public class SecurityEvaluatorAssembler extends AssemblerBase implements Assembl } // get the arguments as specified. - List<Object> args = new ArrayList<Object>(); + List<Object> args = new ArrayList<>(); Resource argRes = getUniqueResource( root, ARGUMENT_LIST ); if (argRes != null) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java index e660f07..386b8ab 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/SecuredGraphEventManager.java @@ -373,14 +373,14 @@ public class SecuredGraphEventManager implements GraphEventManager { // the security evaluator in use private final SecuredGraph securedGraph; private final Graph baseGraph; - private final Map<GraphListener, Stack<SecuredGraphListener>> listenerMap = new HashMap<GraphListener, Stack<SecuredGraphListener>>(); + private final Map<GraphListener, Stack<SecuredGraphListener>> listenerMap = new HashMap<>(); private static Set<Action> DELETE; private static Set<Action> ADD; static { - SecuredGraphEventManager.ADD = new HashSet<Action>( + SecuredGraphEventManager.ADD = new HashSet<>( Arrays.asList(new Action[] { Action.Create, Action.Read })); - SecuredGraphEventManager.DELETE = new HashSet<Action>( + SecuredGraphEventManager.DELETE = new HashSet<>( Arrays.asList(new Action[] { Action.Delete, Action.Read })); } @@ -581,7 +581,7 @@ public class SecuredGraphEventManager implements GraphEventManager { public synchronized GraphEventManager register(final GraphListener listener) { Stack<SecuredGraphListener> sgl = listenerMap.get(listener); if (sgl == null) { - sgl = new Stack<SecuredGraphListener>(); + sgl = new Stack<>(); } sgl.push(new SecuredGraphListener(listener)); listenerMap.put(listener, sgl);
