http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java index 22dccf2..f658426 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/graph/impl/Factory.java @@ -41,8 +41,7 @@ public class Factory final PrefixMapping prefixMapping ) { - final ItemHolder<PrefixMapping, SecuredPrefixMapping> holder = new ItemHolder<PrefixMapping, SecuredPrefixMapping>( - prefixMapping); + final ItemHolder<PrefixMapping, SecuredPrefixMapping> holder = new ItemHolder<>(prefixMapping); final SecuredPrefixMappingImpl checker = new SecuredPrefixMappingImpl( graph, holder); // if we are going to create a duplicate proxy just return this one. @@ -74,8 +73,7 @@ public class Factory final Graph graph ) { - final ItemHolder<Graph, SecuredGraphImpl> holder = new ItemHolder<Graph, SecuredGraphImpl>( - graph); + final ItemHolder<Graph, SecuredGraphImpl> holder = new ItemHolder<>(graph); final SecuredGraphImpl checker = new SecuredGraphImpl( securityEvaluator, graphIRI, holder) { };
http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java index d0dab31..c15f980 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/ItemHolder.java @@ -97,7 +97,7 @@ public class ItemHolder<Base, Secured extends SecuredItem> @SuppressWarnings( "unchecked" ) public final Secured setSecuredItem( final SecuredItemInvoker handler ) { - final Set<Class<?>> ifac = new LinkedHashSet<Class<?>>(); + final Set<Class<?>> ifac = new LinkedHashSet<>(); if (baseItem.getClass().isInterface()) { ifac.add(baseItem.getClass()); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java index 382d026..036f753 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/impl/SecuredItemImpl.java @@ -145,9 +145,9 @@ public abstract class SecuredItemImpl implements SecuredItem { // the maximum size of the cache public static int MAX_CACHE = 100; // the cache for this thread. - public static final ThreadLocal<LRUMap<CacheKey, Boolean>> CACHE = new ThreadLocal<LRUMap<CacheKey, Boolean>>(); + public static final ThreadLocal<LRUMap<CacheKey, Boolean>> CACHE = new ThreadLocal<>(); // the number of times this thread has recursively called the constructor. - public static final ThreadLocal<Integer> COUNT = new ThreadLocal<Integer>(); + public static final ThreadLocal<Integer> COUNT = new ThreadLocal<>(); /** * May Convert a Jena Node object into the SecurityEvaluator.VARIABLE @@ -300,7 +300,7 @@ public abstract class SecuredItemImpl implements SecuredItem { * @return the value of the security check or <code>null</code> if the value * has not been cached. */ - private Boolean cacheGet(final CacheKey key) { + private static Boolean cacheGet(final CacheKey key) { final LRUMap<CacheKey, Boolean> cache = SecuredItemImpl.CACHE.get(); return (cache == null) ? null : (Boolean) cache.get(key); } @@ -313,7 +313,7 @@ public abstract class SecuredItemImpl implements SecuredItem { * @param value * The value to set. */ - private void cachePut(final CacheKey key, final boolean value) { + private static void cachePut(final CacheKey key, final boolean value) { final LRUMap<CacheKey, Boolean> cache = SecuredItemImpl.CACHE.get(); if (cache != null) { cache.put(key, value); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java index f5947ab..36ffcfd 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredAltImpl.java @@ -56,7 +56,7 @@ public class SecuredAltImpl extends SecuredContainerImpl implements SecuredAlt { if (alt == null) { throw new IllegalArgumentException("Alt may not be null"); } - final ItemHolder<Alt, SecuredAlt> holder = new ItemHolder<Alt, SecuredAlt>( + final ItemHolder<Alt, SecuredAlt> holder = new ItemHolder<>( alt); final SecuredAltImpl checker = new SecuredAltImpl(securedModel, holder); // if we are going to create a duplicate proxy, just return this http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java index 785ba5d..76ccb8f 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredBagImpl.java @@ -49,7 +49,7 @@ public class SecuredBagImpl extends SecuredContainerImpl implements SecuredBag { throw new IllegalArgumentException("Bag may not be null"); } - final ItemHolder<Bag, SecuredBag> holder = new ItemHolder<Bag, SecuredBag>( + final ItemHolder<Bag, SecuredBag> holder = new ItemHolder<>( bag); final SecuredBagImpl checker = new SecuredBagImpl(securedModel, holder); // if we are going to create a duplicate proxy, just return this http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java index 9fc4490..4574087 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredContainerImpl.java @@ -74,7 +74,7 @@ public class SecuredContainerImpl extends SecuredResourceImpl implements goodContainer = securedModel.createBag(); } - final ItemHolder<Container, SecuredContainer> holder = new ItemHolder<Container, SecuredContainer>( + final ItemHolder<Container, SecuredContainer> holder = new ItemHolder<>( goodContainer); final SecuredContainerImpl checker = new SecuredContainerImpl( @@ -313,7 +313,7 @@ public class SecuredContainerImpl extends SecuredResourceImpl implements // listProperties calls checkRead(); SecuredStatementIterator iter = listProperties(); try { - SortedSet<Statement> result = new TreeSet<Statement>( + SortedSet<Statement> result = new TreeSet<>( new ContainerComparator()); while (iter.hasNext()) { Statement stmt = iter.next(); @@ -321,7 +321,7 @@ public class SecuredContainerImpl extends SecuredResourceImpl implements result.add(stmt); } } - return new SecuredNodeIterator<RDFNode>(getModel(), + return new SecuredNodeIterator<>(getModel(), new StatementRemovingIterator(result.iterator()) .mapWith(s -> s.getObject())); } finally { @@ -332,11 +332,11 @@ public class SecuredContainerImpl extends SecuredResourceImpl implements @Override public SecuredNodeIterator<RDFNode> iterator(final Set<Action> perms) { checkRead(); - final Set<Action> permsCopy = new HashSet<Action>(perms); + final Set<Action> permsCopy = new HashSet<>(perms); permsCopy.add(Action.Read); final ExtendedIterator<RDFNode> ni = getStatementIterator(perms) .mapWith(o -> o.getObject()); - return new SecuredNodeIterator<RDFNode>(getModel(), ni); + return new SecuredNodeIterator<>(getModel(), ni); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java index 21d9bb2..85016d8 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredLiteralImpl.java @@ -62,7 +62,7 @@ public class SecuredLiteralImpl extends SecuredRDFNodeImpl implements literal.getLexicalForm(), literal.getDatatype()); } - final ItemHolder<Literal, SecuredLiteral> holder = new ItemHolder<Literal, SecuredLiteral>( + final ItemHolder<Literal, SecuredLiteral> holder = new ItemHolder<>( goodLiteral); final SecuredLiteralImpl checker = new SecuredLiteralImpl(securedModel, holder); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java index e0024f4..98fb038 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredModelImpl.java @@ -214,7 +214,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { */ public static SecuredModel getInstance(final SecurityEvaluator securityEvaluator, final String modelIRI, final Model model) { - final ItemHolder<Model, SecuredModel> holder = new ItemHolder<Model, SecuredModel>(model); + final ItemHolder<Model, SecuredModel> holder = new ItemHolder<>(model); final SecuredModelImpl checker = new SecuredModelImpl(securityEvaluator, modelIRI, holder); // if we are going to create a duplicate proxy, just return this @@ -233,7 +233,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { // The secured graph that this securedModel contains. private final SecuredGraph graph; - Map<ModelChangedListener, SecuredModelChangedListener> listeners = new HashMap<ModelChangedListener, SecuredModelChangedListener>(); + Map<ModelChangedListener, SecuredModelChangedListener> listeners = new HashMap<>(); /** * Constructor. @@ -353,7 +353,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { throws UpdateDeniedException, AddDeniedException, AuthenticationRequiredException { checkUpdate(); if (!canCreate(Triple.ANY)) { - final List<Triple> lst = new ArrayList<Triple>(); + final List<Triple> lst = new ArrayList<>(); try { while (iter.hasNext()) { final Statement s = iter.next(); @@ -696,7 +696,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { if (!canCreateAny) { // have to check each of the possible entries in the list for // creation. - final List<RDFNode> nodes = new ArrayList<RDFNode>(); + final List<RDFNode> nodes = new ArrayList<>(); while (members.hasNext()) { final RDFNode n = members.next(); @@ -1406,7 +1406,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { if (!canRead(Triple.ANY)) { nIter = nIter.filterKeep(new ObjectFilter()); } - return new SecuredNodeIterator<RDFNode>(holder.getSecuredItem(), nIter); + return new SecuredNodeIterator<>(holder.getSecuredItem(), nIter); } @Override @@ -1417,7 +1417,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { if (!canRead(Triple.ANY)) { nIter = nIter.filterKeep(new ObjectFilter(p)); } - return new SecuredNodeIterator<RDFNode>(holder.getSecuredItem(), nIter); + return new SecuredNodeIterator<>(holder.getSecuredItem(), nIter); } @Override @@ -1428,7 +1428,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { if (!canRead(Triple.ANY)) { nIter = nIter.filterKeep(new ObjectFilter(p)); } - return new SecuredNodeIterator<RDFNode>(holder.getSecuredItem(), nIter); + return new SecuredNodeIterator<>(holder.getSecuredItem(), nIter); } @Override @@ -1789,7 +1789,7 @@ public class SecuredModelImpl extends SecuredItemImpl implements SecuredModel { throws UpdateDeniedException, DeleteDeniedException, AuthenticationRequiredException { checkUpdate(); if (!canDelete(Triple.ANY)) { - final List<Triple> lst = new ArrayList<Triple>(); + final List<Triple> lst = new ArrayList<>(); try { while (iter.hasNext()) { final Statement s = iter.next(); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java index c9df0ba..c7527b9 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredNodeIterator.java @@ -64,7 +64,7 @@ public class SecuredNodeIterator<T extends RDFNode> implements NodeIterator SecuredNodeIterator( final SecuredModel securedModel, final ExtendedIterator<T> wrapped ) { - final PermNodeMap<T> map1 = new PermNodeMap<T>(securedModel); + final PermNodeMap<T> map1 = new PermNodeMap<>(securedModel); iter = wrapped.mapWith(map1); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java index 2189a62..8d3072d 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredPropertyImpl.java @@ -64,7 +64,7 @@ public class SecuredPropertyImpl extends SecuredResourceImpl implements } } - final ItemHolder<Property, SecuredProperty> holder = new ItemHolder<Property, SecuredProperty>( + final ItemHolder<Property, SecuredProperty> holder = new ItemHolder<>( goodProp); final SecuredPropertyImpl checker = new SecuredPropertyImpl( securedModel, holder); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java index 3ad07ef..21a5f78 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRDFListImpl.java @@ -109,7 +109,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements goodList = securedModel.createList(rdfList.asJavaList().iterator()); } - final ItemHolder<RDFList, SecuredRDFList> holder = new ItemHolder<RDFList, SecuredRDFList>( + final ItemHolder<RDFList, SecuredRDFList> holder = new ItemHolder<>( goodList); final SecuredRDFListImpl checker = new SecuredRDFListImpl(securedModel, holder); @@ -266,10 +266,10 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements } private Set<Statement> collectStatements(final Set<Action> actions) { - final Set<Statement> stmts = new HashSet<Statement>(); + final Set<Statement> stmts = new HashSet<>(); final ExtendedIterator<RDFList> iter = WrappedIterator.create( new RDFListIterator(holder.getBaseItem())).filterKeep( - new RDFListSecFilter<RDFList>(this, actions)); + new RDFListSecFilter<>(this, actions)); try { while (iter.hasNext()) { stmts.addAll(iter.next().listProperties().toSet()); @@ -294,7 +294,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements Triple t = new Triple(SecurityEvaluator.FUTURE, listFirst() .asNode(), Node.ANY); if (!canCreate(t)) { - final List<RDFNode> list = new ArrayList<RDFNode>(); + final List<RDFNode> list = new ArrayList<>(); while (nodes.hasNext()) { final RDFNode n = nodes.next(); t = new Triple(SecurityEvaluator.FUTURE, listFirst() @@ -419,14 +419,14 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements final Action perm) { return WrappedIterator .create(new RDFListIterator(holder.getBaseItem())).filterKeep( - new RDFListSecFilter<RDFList>(this, perm)); + new RDFListSecFilter<>(this, perm)); } private ExtendedIterator<RDFList> getSecuredRDFListIterator( final Set<Action> perm) { return WrappedIterator .create(new RDFListIterator(holder.getBaseItem())).filterKeep( - new RDFListSecFilter<RDFList>(this, perm)); + new RDFListSecFilter<>(this, perm)); } @Override @@ -529,7 +529,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements public ExtendedIterator<RDFNode> iterator(final Set<Action> constraints) throws ReadDeniedException, AuthenticationRequiredException { checkRead(); - final Set<Action> req = new HashSet<Action>(constraints); + final Set<Action> req = new HashSet<>(constraints); req.add(Action.Read); return getSecuredRDFListIterator(req).mapWith(new PlainNodeMap()); @@ -579,7 +579,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements ListIndexException, InvalidListException, ReadDeniedException, AuthenticationRequiredException { Object acc = initial; - final Set<Action> perms = new HashSet<Action>(requiredActions); + final Set<Action> perms = new HashSet<>(requiredActions); perms.add(Action.Read); for (final Iterator<RDFNode> i = iterator(perms); i.hasNext();) { acc = fn.reduce(i.next(), acc); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredReifiedStatementImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredReifiedStatementImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredReifiedStatementImpl.java index de4759e..5d430ca 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredReifiedStatementImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredReifiedStatementImpl.java @@ -50,7 +50,7 @@ public class SecuredReifiedStatementImpl extends SecuredResourceImpl implements if (stmt == null) { throw new IllegalArgumentException("Statement may not be null"); } - final ItemHolder<ReifiedStatement, SecuredReifiedStatement> holder = new ItemHolder<ReifiedStatement, SecuredReifiedStatement>( + final ItemHolder<ReifiedStatement, SecuredReifiedStatement> holder = new ItemHolder<>( stmt); final SecuredReifiedStatementImpl checker = new SecuredReifiedStatementImpl( securedModel, holder); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java index 7b09457..60bbcf4 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResourceImpl.java @@ -71,7 +71,7 @@ public class SecuredResourceImpl extends SecuredRDFNodeImpl implements SecuredRe } } - final ItemHolder<Resource, SecuredResource> holder = new ItemHolder<Resource, SecuredResource>(goodResource); + final ItemHolder<Resource, SecuredResource> holder = new ItemHolder<>(goodResource); final SecuredResourceImpl checker = new SecuredResourceImpl(securedModel, holder); // if we are going to create a duplicate proxy, just return this http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java index a184302..1fc93d7 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredSeqImpl.java @@ -73,7 +73,7 @@ public class SecuredSeqImpl extends SecuredContainerImpl implements SecuredSeq { if (seq == null) { throw new IllegalArgumentException("Seq may not be null"); } - final ItemHolder<Seq, SecuredSeq> holder = new ItemHolder<Seq, SecuredSeq>( + final ItemHolder<Seq, SecuredSeq> holder = new ItemHolder<>( seq); final SecuredSeqImpl checker = new SecuredSeqImpl(securedModel, holder); // if we are going to create a duplicate proxy, just return this http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java index f3efedd..700a4a7 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementImpl.java @@ -55,7 +55,7 @@ public class SecuredStatementImpl extends SecuredItemImpl implements throw new IllegalArgumentException("Statement may not be null"); } - final ItemHolder<Statement, SecuredStatement> holder = new ItemHolder<Statement, SecuredStatement>( + final ItemHolder<Statement, SecuredStatement> holder = new ItemHolder<>( stmt); final SecuredStatementImpl checker = new SecuredStatementImpl( http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java index 79bf030..bfa94ff 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/query/rewriter/OpRewriter.java @@ -226,8 +226,8 @@ public class OpRewriter implements OpVisitor { addOp(opBGP); } else { // add security filtering to the resulting triples - final List<Triple> newBGP = new ArrayList<Triple>(); - final List<Node> variables = new ArrayList<Node>(); + final List<Triple> newBGP = new ArrayList<>(); + final List<Node> variables = new ArrayList<>(); // register all variables for (final Triple t : opBGP.getPattern().getList()) { newBGP.add(registerBGPTriple(t, variables)); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorParameters.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorParameters.java b/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorParameters.java index 86872c0..dd4382b 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorParameters.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/SecurityEvaluatorParameters.java @@ -87,7 +87,7 @@ public class SecurityEvaluatorParameters extends Suite } } - private final ArrayList<Runner> runners = new ArrayList<Runner>(); + private final ArrayList<Runner> runners = new ArrayList<>(); /** * Only called reflectively. Do not use programmatically. @@ -95,7 +95,7 @@ public class SecurityEvaluatorParameters extends Suite public SecurityEvaluatorParameters( final Class<?> klass ) throws Throwable { super(klass, Collections.<Runner> emptyList()); - final List<Object[]> parametersList = new ArrayList<Object[]>(); + final List<Object[]> parametersList = new ArrayList<>(); final boolean[] bSet = { true, false }; http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/ModelTestSuite.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/ModelTestSuite.java b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/ModelTestSuite.java index 5e89a98..18ac2c0 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/ModelTestSuite.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/ModelTestSuite.java @@ -45,7 +45,7 @@ public class ModelTestSuite extends ParentRunner<Test> @Override protected List<Test> getChildren() { - List<Test> lst = new ArrayList<Test>(); + List<Test> lst = new ArrayList<>(); Enumeration<Test> enm = pkg.tests(); while (enm.hasMoreElements()) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java index dd3b1c6..3c3f9e6 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java @@ -387,7 +387,7 @@ public class SecuredModelTest { public void testCreateList() throws Exception { final Set<Action> CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Update, Action.Create }); - final List<RDFNode> nodeList = new ArrayList<RDFNode>(); + final List<RDFNode> nodeList = new ArrayList<>(); try { securedModel.createList(); if (!securityEvaluator.evaluate(CU)) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java ---------------------------------------------------------------------- diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java index 4b775e5..ade96c9 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredRDFListTest.java @@ -52,13 +52,13 @@ public class SecuredRDFListTest extends SecuredResourceTest { private int count(final Action action) { final Iterator<RDFList> iter = new RDFListIterator((RDFList) getBaseRDFNode()); - return WrappedIterator.create(iter).filterKeep(new RDFListSecFilter<RDFList>(getSecuredRDFList(), action)) + return WrappedIterator.create(iter).filterKeep(new RDFListSecFilter<>(getSecuredRDFList(), action)) .toList().size(); } private int count(final Set<Action> action) { final Iterator<RDFList> iter = new RDFListIterator((RDFList) getBaseRDFNode()); - return WrappedIterator.create(iter).filterKeep(new RDFListSecFilter<RDFList>(getSecuredRDFList(), action)) + return WrappedIterator.create(iter).filterKeep(new RDFListSecFilter<>(getSecuredRDFList(), action)) .toList().size(); } @@ -212,7 +212,7 @@ public class SecuredRDFListTest extends SecuredResourceTest { } try { - final List<Resource> lst = new ArrayList<Resource>(); + final List<Resource> lst = new ArrayList<>(); lst.add(ResourceFactory.createResource("http://example.com/dummyList";)); getSecuredRDFList().concatenate(baseModel.createList(lst.iterator())); if (!securityEvaluator.evaluate(perms)) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/main/java/org/apache/jena/query/spatial/DistanceUnitsUtils.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/DistanceUnitsUtils.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/DistanceUnitsUtils.java index 1cd19de..2d1ab58 100644 --- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/DistanceUnitsUtils.java +++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/DistanceUnitsUtils.java @@ -31,7 +31,7 @@ public class DistanceUnitsUtils { static { // International spelling "metres" // As used by http://en.wikipedia.org/wiki/International_Bureau_of_Weights_and_Measures - SUPPORTED_UNITS = new ArrayList<String>(); + SUPPORTED_UNITS = new ArrayList<>(); SUPPORTED_UNITS.add("kilometres"); SUPPORTED_UNITS.add("kilometers"); // America spelling SUPPORTED_UNITS.add("km"); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java index 77daf6c..58f100b 100644 --- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java +++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/EntityDefinition.java @@ -65,15 +65,15 @@ public class EntityDefinition { : entityField; this.geoField = geoField == null || geoField.isEmpty() ? "geoField" : geoField; - this.WKTPredicates = new HashSet<Node>(); - this.builtinWKTPredicates = new HashSet<Node>(); - this.spatialPredicatePairs = new HashSet<SpatialPredicatePair>(); - this.builtinSpatialPredicatePairs = new HashSet<SpatialPredicatePair>(); + this.WKTPredicates = new HashSet<>(); + this.builtinWKTPredicates = new HashSet<>(); + this.spatialPredicatePairs = new HashSet<>(); + this.builtinSpatialPredicatePairs = new HashSet<>(); initBuiltinPredicates(); } public void setSpatialContextFactory(String spatialContextFactoryClass) { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("spatialContextFactory", spatialContextFactoryClass); SpatialQuery.ctx = SpatialContextFactory.makeSpatialContext(map, SpatialQuery.class.getClassLoader()); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java index 36a6801..2fc7953 100644 --- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java +++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexContext.java @@ -39,7 +39,7 @@ public class SpatialIndexContext { super(); this.defn = indexer.getDocDef(); this.indexer = indexer; - this.spatialPredicatePairValues = new HashMap<String, Set<SpatialPredicatePairValue>>(); + this.spatialPredicatePairValues = new HashMap<>(); } public void index(Node g, Node s, Node p, Node o) { @@ -59,7 +59,7 @@ public class SpatialIndexContext { Set<SpatialPredicatePairValue> pairValues = spatialPredicatePairValues .get(x); if (pairValues == null) { - pairValues = new HashSet<SpatialPredicatePairValue>(); + pairValues = new HashSet<>(); spatialPredicatePairValues.put(x, pairValues); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java index cace70b..4e0d340 100644 --- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java +++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexLucene.java @@ -206,7 +206,7 @@ public class SpatialIndexLucene implements SpatialIndex { TopDocs docs = indexSearcher.search(new MatchAllDocsQuery(), filter, limit, distSort); - List<Node> results = new ArrayList<Node>(); + List<Node> results = new ArrayList<>(); // Align and DRY with Solr. for (ScoreDoc sd : docs.scoreDocs) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java index 3cb02a5..507e6ee 100644 --- a/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java +++ b/jena-spatial/src/main/java/org/apache/jena/query/spatial/SpatialIndexSolr.java @@ -125,7 +125,7 @@ public class SpatialIndexSolr implements SpatialIndex { public List<Node> query(Shape shape, int limit, SpatialOperation operation) { SolrDocumentList solrResults = solrQuery(shape, limit, operation); - List<Node> results = new ArrayList<Node>(); + List<Node> results = new ArrayList<>(); for (SolrDocument sd : solrResults) { String str = (String) sd.getFieldValue(docDef.getEntityField()); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java index 3fdeaca..000b6ff 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/AbstractTestIndexingSpatialData.java @@ -43,7 +43,7 @@ public class AbstractTestIndexingSpatialData extends "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testIndexingStringLiteral"; }))); @@ -76,7 +76,7 @@ public class AbstractTestIndexingSpatialData extends "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testIndexingWKTLiteral"; }))); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java index 485a081..5f16116 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/TestTDBDatasetWithLuceneSpatialIndex.java @@ -62,7 +62,7 @@ public class TestTDBDatasetWithLuceneSpatialIndex extends "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -86,7 +86,7 @@ public class TestTDBDatasetWithLuceneSpatialIndex extends "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java index 35b634b..24429b3 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestEastPF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialI String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:east (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialI String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:east (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialI String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:north (51.3000 0.0000 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialI queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:east (51.3000 0.0000 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialI queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:east (51.3000 0.0000 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestEastPF extends AbstractTestDatasetWithSpatialI queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:east (51.3000 0.0000 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java index 0b30782..abb7216 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIntersectsBoxPF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWit String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWit String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWit String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWit queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWit queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:intersectBox (51.1000 -4.0000 51.4000 0.0000 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestIntersectsBoxPF extends AbstractTestDatasetWit queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java index 2e84cad..c2175e7 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsNearByPF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } @@ -155,7 +155,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'miles') .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -169,7 +169,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'mi') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -183,7 +183,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'kilometres') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -196,7 +196,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'km') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -209,7 +209,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 10000.0 'metres') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -220,7 +220,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 10000.0 'm') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -232,7 +232,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 1000000.0 'centimetres') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -243,7 +243,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 1000000.0 'cm') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -255,7 +255,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 10000000.0 'millimetres') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -266,7 +266,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 10000000.0 'mm') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -278,7 +278,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 0.09 'degrees') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -289,7 +289,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 0.09 'de') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -302,13 +302,13 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 1 'mi') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:nearby (51.3000 -2.71000 100.0 'other unsupported unit' -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } @@ -326,7 +326,7 @@ public abstract class AbstractTestIsNearByPF extends AbstractTestDatasetWithSpat " :center geo:lat ?lat .", " :center geo:long ?long .", " ?s spatial:nearby (?lat ?long 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testLatLongBound";, "http://example.org/data/resource/center"; }))); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java index 7ae76ac..650d550 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinBoxPF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithS String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithS String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithS String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithS queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithS queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestIsWithinBoxPF extends AbstractTestDatasetWithS queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinBox (51.1000 -4.0000 51.4000 0.0000 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java index 95c65c0..3931b30 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestIsWithinCirclePF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } @@ -155,7 +155,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'miles') .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -169,7 +169,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'mi') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -183,7 +183,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'kilometers') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -196,7 +196,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'km') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -209,7 +209,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 10000.0 'metres') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -220,7 +220,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 10000.0 'm') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -232,7 +232,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 1000000.0 'centimetres') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -243,7 +243,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 1000000.0 'cm') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -255,7 +255,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 10000000.0 'millimeters') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -266,7 +266,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 10000000.0 'mm') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -278,7 +278,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 0.09 'degrees') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -289,7 +289,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 0.09 'de') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -302,13 +302,13 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 1 'mi') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:withinCircle (51.3000 -2.71000 100.0 'other unsupported unit' -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } @@ -326,7 +326,7 @@ public abstract class AbstractTestIsWithinCirclePF extends AbstractTestDatasetWi " <http://example.org/data/resource/center> geo:lat ?lat .", " <http://example.org/data/resource/center> geo:long ?long .", " ?s spatial:nearby (?lat ?long 100.0 'miles' -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testLatLongBound";, "http://example.org/data/resource/center"; }))); http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java index 01e9a7d..3934fc9 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestNorthPF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatial String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:north (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatial String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:north (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatial String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:north (51.3000 0.0000 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatial queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:north (51.3000 0.0000 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatial queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:north (51.3000 0.0000 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestNorthPF extends AbstractTestDatasetWithSpatial queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:north (51.3000 0.0000 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java index a2fad14..4407924 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestSouthPF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatial String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:south (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatial String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:south (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatial String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:south (51.3000 0.0000 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatial queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:south (51.3000 0.0000 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatial queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:south (51.3000 0.0000 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestSouthPF extends AbstractTestDatasetWithSpatial queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:south (51.3000 0.0000 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestWestPF.java ---------------------------------------------------------------------- diff --git a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestWestPF.java b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestWestPF.java index ed63e5d..890acf1 100644 --- a/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestWestPF.java +++ b/jena-spatial/src/test/java/org/apache/jena/query/spatial/pfunction/AbstractTestWestPF.java @@ -37,7 +37,7 @@ public abstract class AbstractTestWestPF extends AbstractTestDatasetWithSpatialI String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:west (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs .addAll(Arrays .asList((new String[] { "http://example.org/data/resource/testOneSimpleResult"; }))); @@ -58,7 +58,7 @@ public abstract class AbstractTestWestPF extends AbstractTestDatasetWithSpatialI String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:west (51.3000 0.0000 -1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll(Arrays.asList((new String[] { "http://example.org/data/resource/"; + label + "1", "http://example.org/data/resource/"; + label + "2" }))); @@ -95,7 +95,7 @@ public abstract class AbstractTestWestPF extends AbstractTestDatasetWithSpatialI String queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:west (51.3000 0.0000 1) .", "}"); - Set<String> expectedURIs = (new HashSet<String>()); + Set<String> expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -109,7 +109,7 @@ public abstract class AbstractTestWestPF extends AbstractTestDatasetWithSpatialI queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:west (51.3000 0.0000 -1) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -122,7 +122,7 @@ public abstract class AbstractTestWestPF extends AbstractTestDatasetWithSpatialI queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:west (51.3000 0.0000 3) .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); expectedURIs.addAll( Arrays.asList(( new String[] { @@ -135,7 +135,7 @@ public abstract class AbstractTestWestPF extends AbstractTestDatasetWithSpatialI queryString = StrUtils.strjoinNL(QUERY_PROLOG, "SELECT ?s", "WHERE {", " ?s spatial:west (51.3000 0.0000 'something not an integer') .", "}"); - expectedURIs = (new HashSet<String>()); + expectedURIs = (new HashSet<>()); doTestSearch(turtle, queryString, expectedURIs); } } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java ---------------------------------------------------------------------- diff --git a/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java b/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java index 462a8ec..add198a 100644 --- a/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java +++ b/jena-text/src/main/java/org/apache/jena/query/text/DatasetGraphText.java @@ -39,7 +39,7 @@ public class DatasetGraphText extends DatasetGraphMonitor implements Transaction // If we are going to implement Transactional, then we are going to have to do as DatasetGraphWithLock and // TDB's DatasetGraphTransaction do and track transaction state in a ThreadLocal - private final ThreadLocal<ReadWrite> readWriteMode = new ThreadLocal<ReadWrite>(); + private final ThreadLocal<ReadWrite> readWriteMode = new ThreadLocal<>(); public DatasetGraphText(DatasetGraph dsg, TextIndex index, TextDocProducer producer) http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java ---------------------------------------------------------------------- diff --git a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java index f8d5937..e6ef89f 100644 --- a/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java +++ b/jena-text/src/main/java/org/apache/jena/query/text/TextIndexLucene.java @@ -324,7 +324,7 @@ public class TextIndexLucene implements TextIndex { Query query = preParseQuery(qs, queryAnalyzer) ; IndexSearcher indexSearcher = new IndexSearcher(indexReader) ; ScoreDoc[] sDocs = indexSearcher.search(query, 1).scoreDocs ; - List<Map<String, Node>> records = new ArrayList<Map<String, Node>>() ; + List<Map<String, Node>> records = new ArrayList<>() ; // Align and DRY with Solr. for ( ScoreDoc sd : sDocs ) { http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java ---------------------------------------------------------------------- diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java index fc0b98a..6a1404f 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestDatasetWithLuceneTextIndexDeletionSupport.java @@ -89,7 +89,7 @@ public class TestDatasetWithLuceneTextIndexDeletionSupport extends AbstractTestD " ?s text:query ( rdfs:label 'same' ) .", "}" ); - Set<String> expectedURIs = new HashSet<String>() ; + Set<String> expectedURIs = new HashSet<>() ; expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/object1";, "http://example.org/data/resource/object2";)) ; doTestSearch(turtle, queryString, expectedURIs); @@ -102,7 +102,7 @@ public class TestDatasetWithLuceneTextIndexDeletionSupport extends AbstractTestD ); doUpdate(updateString); - expectedURIs = new HashSet<String>() ; + expectedURIs = new HashSet<>() ; expectedURIs.addAll( Arrays.asList("http://example.org/data/resource/object2";)) ; doTestQuery(dataset, "", queryString, expectedURIs, 1); } http://git-wip-us.apache.org/repos/asf/jena/blob/ca9021f9/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java ---------------------------------------------------------------------- diff --git a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java index bbd36e5..2b97064 100644 --- a/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java +++ b/jena-text/src/test/java/org/apache/jena/query/text/TestLuceneWithMultipleThreads.java @@ -179,7 +179,7 @@ public class TestLuceneWithMultipleThreads final DatasetGraphText dsg = (DatasetGraphText)TextDatasetFactory.createLucene(DatasetGraphFactory.create(), new RAMDirectory(), new TextIndexConfig(entDef)); final int numReaders = 2; - final List<Future<?>> futures = new ArrayList<Future<?>>(numReaders); + final List<Future<?>> futures = new ArrayList<>(numReaders); final ExecutorService execService = Executors.newFixedThreadPool(numReaders); final Dataset ds = DatasetFactory.wrap(dsg);
