You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2015/05/01 15:28:08 UTC
[1/3] jena git commit: Deprecating Map1 in favor of Java8 Function
Repository: jena
Updated Branches:
refs/heads/master 3573bd76d -> 3656b686b
Deprecating Map1 in favor of Java8 Function
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/65ce6b50
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/65ce6b50
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/65ce6b50
Branch: refs/heads/master
Commit: 65ce6b50a8672b16e7a120e8319a706068a315d6
Parents: fe98924
Author: ajs6f <aj...@virginia.edu>
Authored: Thu Apr 30 15:27:16 2015 -0400
Committer: ajs6f <aj...@virginia.edu>
Committed: Fri May 1 09:07:09 2015 -0400
----------------------------------------------------------------------
jena-core/src/main/java/jena/schemagen.java | 8 +-
.../assembler/assemblers/AssemblerBase.java | 17 +---
.../assembler/assemblers/ModelAssembler.java | 26 ++----
.../java/org/apache/jena/graph/GraphUtil.java | 30 +------
.../main/java/org/apache/jena/graph/Triple.java | 12 +--
.../apache/jena/mem/GraphTripleStoreBase.java | 6 +-
.../jena/ontology/impl/AllDifferentImpl.java | 7 +-
.../impl/BooleanClassDescriptionImpl.java | 2 +-
.../jena/ontology/impl/DataRangeImpl.java | 2 +-
.../jena/ontology/impl/EnumeratedClassImpl.java | 2 +-
.../jena/ontology/impl/IndividualImpl.java | 2 +-
.../apache/jena/ontology/impl/OntClassImpl.java | 4 +-
.../apache/jena/ontology/impl/OntModelImpl.java | 44 ++--------
.../jena/ontology/impl/OntPropertyImpl.java | 4 +-
.../jena/ontology/impl/OntResourceImpl.java | 91 +++-----------------
.../java/org/apache/jena/rdf/model/RDFList.java | 5 +-
.../org/apache/jena/rdf/model/Statement.java | 20 +----
.../jena/rdf/model/impl/IteratorFactory.java | 15 +---
.../apache/jena/rdf/model/impl/ModelCom.java | 13 +--
.../jena/rdf/model/impl/ModelReifier.java | 15 +---
.../apache/jena/rdf/model/impl/RDFListImpl.java | 3 +-
.../jena/rdfxml/xmloutput/impl/Relation.java | 27 +-----
.../jena/rdfxml/xmloutput/impl/Unparser.java | 12 +--
.../jena/util/iterator/ExtendedIterator.java | 3 +-
.../apache/jena/util/iterator/LazyIterator.java | 4 +-
.../org/apache/jena/util/iterator/Map1.java | 17 ++--
.../apache/jena/util/iterator/Map1Iterator.java | 7 +-
.../apache/jena/util/iterator/NiceIterator.java | 3 +-
.../jena/graph/test/TestFindLiterals.java | 9 +-
.../org/apache/jena/graph/test/TestTriple.java | 6 +-
.../apache/jena/rdf/model/test/TestList.java | 9 +-
.../jena/rdf/model/test/TestStatements.java | 6 +-
.../util/iterator/test/TestMapIterators.java | 8 +-
.../model/impl/SecuredContainerImpl.java | 23 +----
.../model/impl/SecuredNodeIterator.java | 8 +-
.../model/impl/SecuredRDFListImpl.java | 29 +++----
.../model/impl/SecuredRSIterator.java | 9 +-
.../model/impl/SecuredResIterator.java | 8 +-
.../model/impl/SecuredStatementIterator.java | 8 +-
39 files changed, 124 insertions(+), 400 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/jena/schemagen.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/schemagen.java b/jena-core/src/main/java/jena/schemagen.java
index 63aed08..50240ed 100644
--- a/jena-core/src/main/java/jena/schemagen.java
+++ b/jena-core/src/main/java/jena/schemagen.java
@@ -30,6 +30,7 @@ import java.net.MalformedURLException;
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.function.Function;
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
@@ -972,12 +973,7 @@ public class schemagen {
}
// collect the classes to list
- List<Resource> classes = m_source.listStatements( null, RDF.type, cls ).mapWith( new Map1<Statement, Resource>() {
- @Override
- public Resource map1( Statement s ) {
- return s.getSubject();
- }}
- ).toList();
+ List<Resource> classes = m_source.listStatements( null, RDF.type, cls ).mapWith( s -> s.getSubject()).toList();
for (Iterator<? extends RDFNode> i = sorted( classes ); i.hasNext(); ) {
writeValue( (Resource) i.next(), template, "Resource", "createResource", "_CLASS" );
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerBase.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerBase.java
index df63b68..560eada 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerBase.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerBase.java
@@ -19,30 +19,15 @@
package org.apache.jena.assembler.assemblers;
import java.util.List;
-
import org.apache.jena.assembler.* ;
import org.apache.jena.assembler.exceptions.* ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.shared.JenaException ;
-import org.apache.jena.util.iterator.Map1 ;
import org.apache.jena.vocabulary.RDF ;
public abstract class AssemblerBase implements Assembler
{
- protected static class MapObjectToContent implements Map1<Statement, Content>
- {
- protected final Assembler a;
-
- public MapObjectToContent( Assembler a )
- { this.a = a; }
-
- @Override
- public Content map1( Statement o )
- { return (Content) a.open( getResource( o ) ); }
- }
- protected static final Map1<Statement, RDFNode> getObject = Statement.Util.getObject;
-
@Override
public final Object open( Resource root )
{ return open( this, root ); }
@@ -70,7 +55,7 @@ public abstract class AssemblerBase implements Assembler
protected static RDFNode getUnique( Resource root, Property property )
{
- List<RDFNode> nodes = root.listProperties( property ) .mapWith( getObject ).toList();
+ List<RDFNode> nodes = root.listProperties( property ) .mapWith( s -> s.getObject() ).toList();
if (nodes.size() == 0) return null;
if (nodes.size() == 1) return nodes.get(0);
throw new NotUniqueException( root, property );
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ModelAssembler.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ModelAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ModelAssembler.java
index 1468293..35d7491 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ModelAssembler.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ModelAssembler.java
@@ -19,12 +19,12 @@
package org.apache.jena.assembler.assemblers;
import java.util.*;
+import java.util.function.Function;
import org.apache.jena.assembler.* ;
import org.apache.jena.assembler.exceptions.* ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.shared.* ;
-import org.apache.jena.util.iterator.Map1 ;
import org.apache.jena.vocabulary.RDF ;
public abstract class ModelAssembler extends AssemblerBase implements Assembler
@@ -107,27 +107,17 @@ public abstract class ModelAssembler extends AssemblerBase implements Assembler
private void transferContentProperties( Model partial, Resource someInitial, Resource combined )
{
- Map1<Statement, Statement> replace = replaceSubjectMap( partial, combined );
- for ( Property contentProperty : ContentAssembler.contentProperties )
+ for ( Property contentProperty : ContentAssembler.contentProperties )
{
- partial.add( copyProperties( someInitial, replace, contentProperty ) );
+ partial.add( copyProperties( someInitial, replaceSubjectMap( partial, combined ), contentProperty ) );
}
}
- private List<Statement> copyProperties( Resource root, Map1<Statement, Statement> replace, Property property )
+ private List<Statement> copyProperties( Resource root, Function<Statement, Statement> replace, Property property )
{ return root.listProperties( property ).mapWith( replace ).toList(); }
- private Map1<Statement, Statement> replaceSubjectMap( final Model inModel, final Resource newSubject )
- {
- Map1<Statement, Statement> replace = new Map1<Statement, Statement>()
- {
- @Override
- public Statement map1( Statement o )
- {
- Statement s = o;
- return inModel.createStatement( newSubject, s.getPredicate(), s.getObject() );
- }
- };
- return replace;
- }
+ private Function<Statement, Statement> replaceSubjectMap( final Model inModel, final Resource newSubject ) {
+ return s -> inModel.createStatement(newSubject, s.getPredicate(), s.getObject());
+ }
+
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java b/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java
index 932c55a..8b3da79 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/GraphUtil.java
@@ -21,11 +21,9 @@ package org.apache.jena.graph;
import java.util.Iterator ;
import java.util.List ;
import java.util.Set ;
-
import org.apache.jena.graph.impl.GraphWithPerform ;
import org.apache.jena.util.IteratorCollection ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Map1 ;
import org.apache.jena.util.iterator.WrappedIterator ;
/**
@@ -38,28 +36,6 @@ public class GraphUtil
*/
private GraphUtil()
{}
-
- private static Map1<Triple, Node> mapSubject = new Map1<Triple, Node>() {
- @Override
- public Node map1(Triple triple)
- {
- return triple.getSubject() ;
- }
- } ;
- private static Map1<Triple, Node> mapPredicate = new Map1<Triple, Node>() {
- @Override
- public Node map1(Triple triple)
- {
- return triple.getPredicate() ;
- }
- } ;
- private static Map1<Triple, Node> mapObject = new Map1<Triple, Node>() {
- @Override
- public Node map1(Triple triple)
- {
- return triple.getObject() ;
- }
- } ;
/** Return an iterator over the unique subjects with predciate p and object o.
* p and o can be wildcards (Node.ANY)
@@ -71,7 +47,7 @@ public class GraphUtil
public static ExtendedIterator<Node> listSubjects(Graph g, Node p, Node o) {
// Restore a minimal QueryHandler?
ExtendedIterator<Triple> iter = g.find(Node.ANY, p, o) ;
- Set<Node> nodes = iter.mapWith(mapSubject).toSet() ;
+ Set<Node> nodes = iter.mapWith(t -> t.getSubject()).toSet() ;
return WrappedIterator.createNoRemove(nodes.iterator()) ;
}
@@ -84,7 +60,7 @@ public class GraphUtil
*/
public static ExtendedIterator<Node> listPredicates(Graph g, Node s, Node o) {
ExtendedIterator<Triple> iter = g.find(s,Node.ANY, o) ;
- Set<Node> nodes = iter.mapWith(mapPredicate).toSet() ;
+ Set<Node> nodes = iter.mapWith(t -> t.getPredicate()).toSet() ;
return WrappedIterator.createNoRemove(nodes.iterator()) ;
}
@@ -97,7 +73,7 @@ public class GraphUtil
*/
public static ExtendedIterator<Node> listObjects(Graph g, Node s, Node p) {
ExtendedIterator<Triple> iter = g.find(s, p, Node.ANY) ;
- Set<Node> nodes = iter.mapWith(mapObject).toSet() ;
+ Set<Node> nodes = iter.mapWith(t -> t.getObject()).toSet() ;
return WrappedIterator.createNoRemove(nodes.iterator()) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/graph/Triple.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Triple.java b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
index b0f748e..e3428f2 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Triple.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
@@ -83,17 +83,11 @@ public class Triple
public Node getMatchSubject()
{ return anyToNull( subj ); }
- public static final Map1<Triple, Node> getSubject = new Map1<Triple, Node>()
- { @Override
- public Node map1( Triple t ) { return t.getSubject(); } };
+ public static final Map1<Triple, Node> getSubject = t -> t.getSubject();
- public static final Map1<Triple, Node> getPredicate = new Map1<Triple, Node>()
- { @Override
- public Node map1( Triple t ) { return t.getPredicate(); } };
+ public static final Map1<Triple, Node> getPredicate = t -> t.getPredicate();
- public static final Map1<Triple, Node> getObject = new Map1<Triple, Node>()
- { @Override
- public Node map1( Triple t ) { return t.getObject(); } };
+ public static final Map1<Triple, Node> getObject = t -> t.getObject();
/** Return predicate or null, not Node.ANY */
public Node getMatchPredicate()
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreBase.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreBase.java b/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreBase.java
index 0708efa..80b46a8 100644
--- a/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreBase.java
+++ b/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreBase.java
@@ -111,11 +111,7 @@ public abstract class GraphTripleStoreBase implements TripleStore
{ return expectOnlyNodes( predicates.domain() ); }
private ExtendedIterator<Node> expectOnlyNodes( Iterator<Object> elements )
- { return WrappedIterator.createNoRemove( elements ).mapWith( expectNode ); }
-
- private static final Map1<Object, Node> expectNode = new Map1<Object, Node>()
- { @Override
- public Node map1( Object o ) { return (Node) o; }};
+ { return WrappedIterator.createNoRemove( elements ).mapWith( o -> (Node) o ); }
@Override
public ExtendedIterator<Node> listObjects()
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/AllDifferentImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/AllDifferentImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/AllDifferentImpl.java
index 02d4e3f..d72e5d7 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/AllDifferentImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/AllDifferentImpl.java
@@ -30,7 +30,6 @@ import org.apache.jena.graph.* ;
import org.apache.jena.ontology.* ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Map1 ;
/**
@@ -149,11 +148,7 @@ public class AllDifferentImpl
*/
@Override
public ExtendedIterator<? extends OntResource> listDistinctMembers() {
- return getDistinctMembers().mapWith( new Map1<RDFNode,OntResource>() {
- @Override
- public OntResource map1( RDFNode o ) {
- return ((Resource) o).as( OntResource.class );
- }} );
+ return getDistinctMembers().mapWith( o -> ((Resource) o).as( OntResource.class ));
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/BooleanClassDescriptionImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/BooleanClassDescriptionImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/BooleanClassDescriptionImpl.java
index 0c89cbb..203f3a3 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/BooleanClassDescriptionImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/BooleanClassDescriptionImpl.java
@@ -125,7 +125,7 @@ public abstract class BooleanClassDescriptionImpl
*/
@Override
public ExtendedIterator<? extends OntClass> listOperands() {
- return getOperands().iterator().mapWith( new AsMapper<>( OntClass.class ) );
+ return getOperands().iterator().mapWith( n -> n.as( OntClass.class ) );
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/DataRangeImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/DataRangeImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/DataRangeImpl.java
index bdb2856..557e73c 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/DataRangeImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/DataRangeImpl.java
@@ -153,7 +153,7 @@ public class DataRangeImpl
*/
@Override
public ExtendedIterator<Literal> listOneOf() {
- return getOneOf().iterator().mapWith( new AsMapper<>( Literal.class ) );
+ return getOneOf().iterator().mapWith( n -> n.as( Literal.class ) );
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/EnumeratedClassImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/EnumeratedClassImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/EnumeratedClassImpl.java
index 915fb6e..71f29d6 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/EnumeratedClassImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/EnumeratedClassImpl.java
@@ -151,7 +151,7 @@ public class EnumeratedClassImpl
*/
@Override
public ExtendedIterator<? extends OntResource> listOneOf() {
- return getOneOf().iterator().mapWith( new AsMapper<>( OntResource.class ) );
+ return getOneOf().iterator().mapWith( n -> n.as( OntResource.class ) );
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/IndividualImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/IndividualImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/IndividualImpl.java
index 1c0f9b9..56c249d 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/IndividualImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/IndividualImpl.java
@@ -189,7 +189,7 @@ public class IndividualImpl
public <T extends OntClass> ExtendedIterator<T> listOntClasses( boolean direct ) {
@SuppressWarnings("unchecked")
ExtendedIterator<T> iter =
- (ExtendedIterator<T>)listRDFTypes( direct ).mapWith( new ResourceAsMapper<>( OntClass.class ) );
+ (ExtendedIterator<T>)listRDFTypes( direct ).mapWith( r -> r.as( OntClass.class ) );
return iter ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
index 651cefa..8397e1f 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntClassImpl.java
@@ -624,7 +624,7 @@ public class OntClassImpl
// return the results, using the ont property facet
return WrappedIterator.create( cands.iterator() )
- .mapWith( new AsMapper<>( OntProperty.class ) );
+ .mapWith( n -> n.as( OntProperty.class ) );
}
@@ -669,7 +669,7 @@ public class OntClassImpl
public ExtendedIterator<Individual> listInstances( final boolean direct ) {
return getModel()
.listStatements( null, RDF.type, this )
- .mapWith( new SubjectAsMapper<>( Individual.class ) )
+ .mapWith( s -> s.getSubject().as( Individual.class ) )
.filterKeep( new Filter<Individual>() {
@Override
public boolean accept( Individual o ) {
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
index 5496823..e6dc9af 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
@@ -28,6 +28,7 @@ import java.io.OutputStream ;
import java.io.Reader ;
import java.io.Writer ;
import java.util.* ;
+import java.util.function.Function;
import org.apache.jena.enhanced.BuiltinPersonalities ;
import org.apache.jena.enhanced.EnhNode ;
@@ -530,7 +531,7 @@ public class OntModelImpl extends ModelCom implements OntModel
{
// we have have both direct sub-class of and a :Thing class to test against
return listStatements( null, ReasonerVocabulary.directSubClassOf, getProfile().THING() )
- .mapWith( new OntResourceImpl.SubjectAsMapper<>( OntClass.class ));
+ .mapWith( s -> s.getSubject().as( OntClass.class ));
}
}
@@ -750,7 +751,7 @@ public class OntModelImpl extends ModelCom implements OntModel
}
else {
return findByType( r )
- .mapWith( new SubjectNodeAs<>( AnnotationProperty.class ) )
+ .mapWith( p -> getNodeAs( p.getSubject(), AnnotationProperty.class ) )
.filterKeep( new UniqueFilter<AnnotationProperty>());
}
}
@@ -2314,13 +2315,12 @@ public class OntModelImpl extends ModelCom implements OntModel
public ExtendedIterator<OntModel> listSubModels( final boolean withImports ) {
ExtendedIterator<Graph> i = WrappedIterator.create( getSubGraphs().iterator() );
- return i.mapWith( new Map1<Graph, OntModel>() {
- @Override
- public OntModel map1( Graph o ) {
+ return i.mapWith(
+ o -> {
Model base = ModelFactory.createModelForGraph( o );
OntModel om = new OntModelImpl( m_spec, base, withImports );
return om;
- }} );
+ } );
}
@@ -2934,7 +2934,7 @@ public class OntModelImpl extends ModelCom implements OntModel
* @return An iterator over all triples <code>_x rdf:type type</code>
*/
protected <T extends RDFNode> ExtendedIterator<T> findByTypeAs( Resource type, Iterator<Resource> types, Class<T> asKey ) {
- return findByType( type, types ).mapWith( new SubjectNodeAs<>( asKey ) );
+ return findByType( type, types ).mapWith( p -> getNodeAs( p.getSubject(), asKey ) );
}
/**
@@ -2967,7 +2967,7 @@ public class OntModelImpl extends ModelCom implements OntModel
* the given polymorphic class.
*/
protected <T extends RDFNode> ExtendedIterator<T> findByTypeAs( Resource type, Class<T> asKey ) {
- return findByType( type ).mapWith( new SubjectNodeAs<>( asKey ) );
+ return findByType( type ).mapWith( p -> getNodeAs( p.getSubject(), asKey ) );
}
/**
@@ -2994,7 +2994,7 @@ public class OntModelImpl extends ModelCom implements OntModel
* @return ExtendedIterator over subjects of p, presented as the facet.
*/
protected <T extends RDFNode> ExtendedIterator<T> findByDefiningPropertyAs( Property p, Class<T> asKey ) {
- return findByDefiningProperty( p ).mapWith( new SubjectNodeAs<>( asKey ) );
+ return findByDefiningProperty( p ).mapWith( x -> getNodeAs( x.getSubject(), asKey ) );
}
@@ -3113,32 +3113,6 @@ public class OntModelImpl extends ModelCom implements OntModel
// Inner class definitions
//==============================================================================
- /** Map triple subjects or single nodes to subject enh nodes, presented as() the given class */
- protected class SubjectNodeAs<To extends RDFNode> implements Map1<Triple, To>
- {
- protected Class<To> m_asKey;
-
- protected SubjectNodeAs( Class<To> asKey ) { m_asKey = asKey; }
-
- @Override
- public To map1( Triple x ) {
- return getNodeAs( x.getSubject(), m_asKey );
- }
-
- }
-
- /** Map triple subjects or single nodes to subject enh nodes, presented as() the given class */
- protected class NodeAs<To extends RDFNode> implements Map1<Node, To>
- {
- protected Class<To> m_asKey;
- protected NodeAs( Class<To> asKey ) { m_asKey = asKey; }
-
- @Override
- public To map1( Node x ) {
- return getNodeAs( x, m_asKey );
- }
- }
-
protected class NodeCanAs<T extends RDFNode> extends Filter<Node>
{
protected Class<T> m_asKey;
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
index def160d..8d11a72 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntPropertyImpl.java
@@ -762,7 +762,7 @@ public class OntPropertyImpl
*/
@Override
public ExtendedIterator<OntProperty> listInverse() {
- return getModel().listStatements( null, getProfile().INVERSE_OF(), this ).mapWith( new SubjectAsMapper<>( OntProperty.class ) );
+ return getModel().listStatements( null, getProfile().INVERSE_OF(), this ).mapWith( s -> s.getSubject().as( OntProperty.class ) );
}
/**
@@ -874,7 +874,7 @@ public class OntPropertyImpl
@Override
public ExtendedIterator<Restriction> listReferringRestrictions() {
return getModel().listStatements( null, getProfile().ON_PROPERTY(), this )
- .mapWith( new SubjectAsMapper<>( Restriction.class ) );
+ .mapWith( s -> s.getSubject().as( Restriction.class ) );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
index 64d14c4..cdd18fe 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntResourceImpl.java
@@ -24,6 +24,7 @@ package org.apache.jena.ontology.impl;
// Imports
///////////////
import java.util.*;
+import java.util.function.Function;
import org.apache.jena.datatypes.xsd.XSDDatatype ;
import org.apache.jena.enhanced.* ;
@@ -338,7 +339,7 @@ public class OntResourceImpl
public ExtendedIterator<RDFNode> listSeeAlso() {
checkProfile( getProfile().SEE_ALSO(), "SEE_ALSO" );
return WrappedIterator.create( listProperties( getProfile().SEE_ALSO() ) )
- .mapWith( new ObjectAsOntResourceMapper() );
+ .mapWith( s -> asOntResource( s.getObject() ) );
}
/**
@@ -406,7 +407,7 @@ public class OntResourceImpl
public ExtendedIterator<RDFNode> listIsDefinedBy() {
checkProfile( getProfile().IS_DEFINED_BY(), "IS_DEFINED_BY" );
return WrappedIterator.create( listProperties( getProfile().IS_DEFINED_BY() ) )
- .mapWith( new ObjectAsOntResourceMapper() );
+ .mapWith( s -> asOntResource( s.getObject() ) );
}
/**
@@ -482,7 +483,7 @@ public class OntResourceImpl
public ExtendedIterator<String> listVersionInfo() {
checkProfile( getProfile().VERSION_INFO(), "VERSION_INFO" );
return WrappedIterator.create( listProperties( getProfile().VERSION_INFO() ) )
- .mapWith( new ObjectAsStringMapper() );
+ .mapWith( s -> s.getString() );
}
/**
@@ -583,7 +584,7 @@ public class OntResourceImpl
checkProfile( getProfile().LABEL(), "LABEL" );
return WrappedIterator.create( listProperties( getProfile().LABEL() ) )
.filterKeep( new LangTagFilter( lang ) )
- .mapWith( new ObjectMapper() );
+ .mapWith( s -> s.getObject() );
}
/**
@@ -713,7 +714,7 @@ public class OntResourceImpl
checkProfile( getProfile().COMMENT(), "COMMENT" );
return WrappedIterator.create( listProperties( getProfile().COMMENT() ) )
.filterKeep( new LangTagFilter( lang ) )
- .mapWith( new ObjectMapper() );
+ .mapWith( s -> s.getObject() );
}
/**
@@ -1014,7 +1015,7 @@ public class OntResourceImpl
*/
@Override
public NodeIterator listPropertyValues( Property property ) {
- return new NodeIteratorImpl( listProperties( property ).mapWith( new ObjectAsOntResourceMapper() ), null );
+ return new NodeIteratorImpl( listProperties( property ).mapWith( s -> asOntResource( s.getObject() ) ), null );
}
/**
@@ -1438,7 +1439,7 @@ public class OntResourceImpl
/** Answer an iterator for the given property, whose values are .as() some class */
protected <T extends RDFNode> ExtendedIterator<T> listAs( Property p, String name, Class<T> cls ) {
checkProfile( p, name );
- return WrappedIterator.create( listProperties( p ) ).mapWith( new ObjectAsMapper<>( cls ) );
+ return WrappedIterator.create( listProperties( p ) ).mapWith( s -> s.getObject().as( cls ) );
}
@@ -1531,7 +1532,7 @@ public class OntResourceImpl
// determine the subject and object pairs for the list statements calls
Resource subject = inverse ? null : this;
Resource object = inverse ? this : null;
- Map1<Statement, T> mapper = inverse ? new SubjectAsMapper<>( cls ) : new ObjectAsMapper<>( cls );
+ Function<Statement, T> mapper = inverse ? s -> s.getSubject().as( cls ) : s -> s.getObject().as( cls );
// are we working on an inference graph?
OntModel m = (OntModel) getGraph();
@@ -1567,7 +1568,7 @@ public class OntResourceImpl
* @return
*/
@SuppressWarnings("unchecked")
- private <T extends Resource> Iterator<T> computeDirectValues( Property p, Property orderRel, boolean inverse, Resource subject, Resource object, Map1<Statement, T> mapper ) {
+ private <T extends Resource> Iterator<T> computeDirectValues( Property p, Property orderRel, boolean inverse, Resource subject, Resource object, Function<Statement, T> mapper ) {
// graph does not support direct directly
ExtendedIterator<T> j = getModel().listStatements( subject, p, object )
.mapWith( mapper );
@@ -1651,78 +1652,6 @@ public class OntResourceImpl
// Inner class definitions
//==============================================================================
- /** Implementation of Map1 that performs as( Class ) for a given class, against an argument {@link RDFNode} */
- protected static class AsMapper<T extends RDFNode> implements Map1<RDFNode, T>
- {
- private Class<T> m_as;
- public AsMapper( Class<T> as ) { m_as = as; }
- @Override
- public T map1( RDFNode x ) { return x.as( m_as ); }
- }
-
- /** Implementation of Map1 that performs as( Class ) for a given class, against an argument {@link Resource} */
- protected static class ResourceAsMapper<T extends RDFNode> implements Map1<Resource, T>
- {
- private Class<T> m_as;
- public ResourceAsMapper( Class<T> as ) { m_as = as; }
- @Override
- public T map1( Resource x ) { return x.as( m_as ); }
- }
-
- /** Implementation of Map1 that performs as( Class ) for a given class, on the subject of a statement */
- protected static class SubjectAsMapper<T extends RDFNode> implements Map1<Statement, T>
- {
- private Class<T> m_as;
- public SubjectAsMapper( Class<T> as ) { m_as = as; }
- @Override
- public T map1( Statement x ) {
- return x.getSubject().as( m_as );
- }
- }
-
- /** Implementation of Map1 that extracts the subject of a statement */
- protected static class SubjectMapper implements Map1<Statement, Resource>
- {
- @Override
- public Resource map1( Statement x ) {
- return x.getSubject();
- }
- }
-
- /** Implementation of Map1 that performs as( Class ) for a given class, on the object of a statement */
- protected static class ObjectAsMapper<T extends RDFNode> implements Map1<Statement, T>
- {
- private Class<T> m_as;
- public ObjectAsMapper( Class<T> as )
- { m_as = as; }
- @Override
- public T map1( Statement x ) {
- return x.getObject().as( m_as );
- }
- }
-
- /** Implementation of Map1 that performs getString on the object of a statement */
- protected class ObjectAsStringMapper implements Map1<Statement, String>
- {
- @Override
- public String map1( Statement x ) { return x.getString(); }
- }
-
- /** Implementation of Map1 that returns the object of a statement */
- protected static class ObjectMapper implements Map1<Statement, RDFNode>
- {
- @Override
- public RDFNode map1( Statement x ) { return x.getObject(); }
- }
-
- /** Implementation of Map1 that returns the object of a statement as an ont resource */
- protected static class ObjectAsOntResourceMapper implements Map1<Statement, RDFNode>
- {
- @Override
- public RDFNode map1( Statement x ) {
- return asOntResource( x.getObject() );
- }
- }
/** Filter for matching language tags on the objects of statements */
protected class LangTagFilter extends Filter<Statement>
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdf/model/RDFList.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFList.java b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFList.java
index 0c58f5c..668974f 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/RDFList.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/RDFList.java
@@ -24,6 +24,7 @@ package org.apache.jena.rdf.model;
// Imports
///////////////
import java.util.*;
+import java.util.function.Function;
import org.apache.jena.util.iterator.* ;
@@ -348,10 +349,10 @@ public interface RDFList
/**
* <p>Answer an iterator of the elements of this list, to each of which
* the given map function has been applied.</p>
- * @param fn A Map function
+ * @param fn A mapping function
* @return The iterator of the elements of this list mapped with the given map function.
*/
- public <T> ExtendedIterator<T> mapWith( Map1<RDFNode, T> fn );
+ public <T> ExtendedIterator<T> mapWith( Function<RDFNode, T> fn );
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
index a1aecd1..14bb52b 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
@@ -396,22 +396,10 @@ public interface Statement extends FrontsTriple
*/
public static class Util
{
- public static final Map1<Statement, Resource> getSubject = new Map1<Statement, Resource>()
- {
- @Override
- public Resource map1( Statement o ) { return o.getSubject(); }
- };
+ public static final Map1<Statement, Resource> getSubject = s -> s.getSubject();
- public static final Map1<Statement, Property> getPredicate = new Map1<Statement, Property>()
- {
- @Override
- public Property map1( Statement o ) { return o.getPredicate(); }
- };
+ public static final Map1<Statement, Property> getPredicate = s -> s.getPredicate();
- public static final Map1<Statement, RDFNode> getObject = new Map1<Statement, RDFNode>()
- {
- @Override
- public RDFNode map1( Statement o ) { return o.getObject(); }
- };
- }
+ public static final Map1<Statement, RDFNode> getObject = s -> s.getObject();
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdf/model/impl/IteratorFactory.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/IteratorFactory.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/IteratorFactory.java
index f6f8b45..622d347 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/IteratorFactory.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/IteratorFactory.java
@@ -39,10 +39,7 @@ public final class IteratorFactory
*/
static public StmtIterator asStmtIterator( Iterator<Triple> i, final ModelCom m )
{
- Map1<Triple, Statement> asStatement = new Map1<Triple, Statement>()
- { @Override
- public Statement map1( Triple t ) { return m.asStatement( t ); }};
- return new StmtIteratorImpl( WrappedIterator.create( i ).mapWith( asStatement ) );
+ return new StmtIteratorImpl( WrappedIterator.create( i ).mapWith( t -> m.asStatement( t ) ) );
}
/**
@@ -50,10 +47,7 @@ public final class IteratorFactory
*/
static public ResIterator asResIterator( Iterator<Node> i, final ModelCom m)
{
- Map1<Node, Resource> asResource = new Map1<Node, Resource>()
- { @Override
- public Resource map1( Node o) { return (Resource) m.asRDFNode( o ); }};
- return new ResIteratorImpl( WrappedIterator.create( i ).mapWith( asResource ), null );
+ return new ResIteratorImpl( WrappedIterator.create( i ).mapWith( o -> (Resource) m.asRDFNode( o ) ), null );
}
/**
@@ -61,10 +55,7 @@ public final class IteratorFactory
*/
static public NodeIterator asRDFNodeIterator( Iterator<Node> i, final ModelCom m)
{
- Map1<Node, RDFNode> asRDFNode = new Map1<Node, RDFNode>()
- { @Override
- public RDFNode map1( Node o) { return m.asRDFNode( o ); }};
- return new NodeIteratorImpl( WrappedIterator.create( i ).mapWith( asRDFNode ), null );
+ return new NodeIteratorImpl( WrappedIterator.create( i ).mapWith( o -> m.asRDFNode( o ) ), null );
}
static Resource asResource( Node n, ModelCom m )
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
index 4410186..7162678 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelCom.java
@@ -1120,13 +1120,8 @@ implements Model, PrefixMapping, Lock
}
private Iterator<Triple> asTriples( StmtIterator it )
- { return it.mapWith( mapAsTriple ); }
+ { return it.mapWith( s -> s.asTriple() ); }
- private Map1<Statement, Triple> mapAsTriple = new Map1<Statement, Triple>() {
- @Override
- public Triple map1( Statement s ) { return s.asTriple(); }
- };
-
/**
remove all the Statements from the model by converting them to triples and
removing those triples from the underlying graph.
@@ -1413,11 +1408,7 @@ implements Model, PrefixMapping, Lock
{ return new ModelCom( g ); }
public StmtIterator asStatements( final Iterator<Triple> it )
- { return new StmtIteratorImpl( new Map1Iterator<>( mapAsStatement, it ) ); }
-
- protected Map1<Triple, Statement> mapAsStatement = new Map1<Triple, Statement>()
- { @Override
- public Statement map1( Triple t ) { return asStatement( t ); } };
+ { return new StmtIteratorImpl( new Map1Iterator<>( t -> asStatement( t ), it ) ); }
public StmtIterator listBySubject( Container cont )
{ return listStatements( cont, null, (RDFNode) null ); }
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelReifier.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelReifier.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelReifier.java
index c5a6933..5f9be14 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelReifier.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/ModelReifier.java
@@ -24,7 +24,6 @@ import org.apache.jena.graph.Triple ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.shared.AlreadyReifiedException ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Map1 ;
/**
This class impedance-matches the reification requests of Model[Com] to the operations
@@ -151,22 +150,12 @@ public class ModelReifier
createReifiedStatement( rs.getURI(), rs.getStatement() );
}
}
-
- /**
- A mapper that maps modes to their corresponding ReifiedStatement objects. This
- cannot be static: getRS cannot be static, because the mapping is model-specific.
- */
- protected final Map1<Node, ReifiedStatement> mapToRS = new Map1<Node, ReifiedStatement>()
- {
- @Override
- public ReifiedStatement map1( Node node ) { return getRS( node ); }
- };
private ExtendedIterator<ReifiedStatement> findReifiedStatements()
- { return ReifierStd .allNodes(model.getGraph()) .mapWith( mapToRS ); }
+ { return ReifierStd .allNodes(model.getGraph()) .mapWith( n -> getRS( n ) ); }
private ExtendedIterator<ReifiedStatement> findReifiedStatements( Triple t )
- { return ReifierStd .allNodes(model.getGraph(), t ) .mapWith( mapToRS ); }
+ { return ReifierStd .allNodes(model.getGraph(), t ) .mapWith( n -> getRS( n ) ); }
/**
Answer a ReifiedStatement that is based on the given node.
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
index a99ae92..d9f5e6d 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/impl/RDFListImpl.java
@@ -24,6 +24,7 @@ package org.apache.jena.rdf.model.impl;
// Imports
///////////////
import java.util.*;
+import java.util.function.Function;
import org.apache.jena.enhanced.* ;
import org.apache.jena.graph.* ;
@@ -669,7 +670,7 @@ public class RDFListImpl
* @return The iterator of the elements of this list mapped with the given map function.
*/
@Override
- public <T> ExtendedIterator<T> mapWith( Map1<RDFNode, T> fn ) {
+ public <T> ExtendedIterator<T> mapWith( Function<RDFNode, T> fn ) {
return iterator().mapWith( fn );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Relation.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Relation.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Relation.java
index 60e43d9..111ab6d 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Relation.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Relation.java
@@ -23,9 +23,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import java.util.Map.Entry;
-
-import org.apache.jena.util.iterator.Map1 ;
import org.apache.jena.util.iterator.Map1Iterator ;
import org.apache.jena.util.iterator.WrappedIterator ;
@@ -207,23 +204,11 @@ class Relation<T> {
return cols.get(b);
}
- // ------------
- private static <X> Map1<X, PairEntry<X, X>> inner(final X a)
- {
- return new Map1<X, PairEntry<X, X>>() {
- @Override
- public PairEntry<X, X> map1(X b)
- {
- return new PairEntry<>(a, b) ;
- }
- } ;
- }
-
private static <T> Iterator<PairEntry<T, T>> pairEntry(Map.Entry<T, Set<T>> pair)
{
final T a = pair.getKey() ;
Set<T> bs = pair.getValue() ;
- return new Map1Iterator<>(inner(a), bs.iterator()) ;
+ return new Map1Iterator<>(b -> new PairEntry<>(a, b), bs.iterator()) ;
}
/**
@@ -235,16 +220,8 @@ class Relation<T> {
*/
public Iterator<PairEntry<T, T>> iterator()
{
- Map1<Map.Entry<T, Set<T>>, Iterator<PairEntry<T, T>>> m1 =
- new Map1<Map.Entry<T, Set<T>>, Iterator<PairEntry<T, T>>>(){
- @Override
- public Iterator<PairEntry<T, T>> map1(Entry<T, Set<T>> entry)
- {
- return pairEntry(entry) ;
- }} ;
-
Map1Iterator<Map.Entry<T, Set<T>>,Iterator<PairEntry<T, T>>> iter1 =
- new Map1Iterator<>(m1 , rows.entrySet().iterator()) ;
+ new Map1Iterator<>( entry -> pairEntry(entry) , rows.entrySet().iterator()) ;
// And now flatten it.
Iterator<PairEntry<T, T>> iter2 = WrappedIterator.createIteratorIterator(iter1) ;
return iter2 ;
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
index 9253d3f..24d8ebf 100644
--- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
+++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmloutput/impl/Unparser.java
@@ -1587,16 +1587,8 @@ class Unparser {
// Now all the pleasing resources are in the buckets.
// Add all their iterators togethor:
- Map1<Set<Resource>, Iterator<Resource>> mapper = new Map1<Set<Resource>, Iterator<Resource>>() {
-
- @Override
- public Iterator<Resource> map1(Set<Resource> bkt)
- {
- return bkt.iterator() ;
- }} ;
-
- return WrappedIterator.createIteratorIterator(
- new Map1Iterator<>(mapper,
+ return WrappedIterator.createIteratorIterator(
+ new Map1Iterator<>(bkt -> bkt.iterator(),
Arrays.asList(bucketArray).iterator()));
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
index af83581..2a0eeb6 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/ExtendedIterator.java
@@ -19,6 +19,7 @@
package org.apache.jena.util.iterator;
import java.util.*;
+import java.util.function.Function;
/**
an ExtendedIterator is a ClosableIterator on which other operations are
@@ -67,7 +68,7 @@ public interface ExtendedIterator<T> extends ClosableIterator<T>
_map1_ to the corresponding element of _this_. _this_ is not
copied; it is consumed as the result is consumed.
*/
- public <U> ExtendedIterator<U> mapWith( Map1<T, U> map1 );
+ public <U> ExtendedIterator<U> mapWith( Function<T, U> map1 );
/**
Answer a list of the [remaining] elements of this iterator, in order,
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
index 4d3b3a4..2411413 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/LazyIterator.java
@@ -18,6 +18,8 @@
package org.apache.jena.util.iterator;
+import java.util.function.Function;
+
/** An ExtendedIterator that is created lazily.
* This is useful when constructing an iterator is expensive and
* you'd prefer to delay doing it until certain it's actually needed.
@@ -74,7 +76,7 @@ abstract public class LazyIterator<T> implements ExtendedIterator<T> {
}
@Override
- public <U> ExtendedIterator<U> mapWith(Map1<T,U> map1) {
+ public <U> ExtendedIterator<U> mapWith(Function<T,U> map1) {
lazy();
return it.mapWith(map1);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/util/iterator/Map1.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/Map1.java b/jena-core/src/main/java/org/apache/jena/util/iterator/Map1.java
index 799f555..bb2fb59 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/Map1.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/Map1.java
@@ -18,13 +18,16 @@
package org.apache.jena.util.iterator;
+import java.util.function.Function;
+
/** Converts an Object to another Object.
*/
-public interface Map1<From, To>
-{ /** Convert an object.
- * @param o The thing to be converted.
- * @return The converted thing.
- *
- */
- To map1( From o );
+@Deprecated
+public interface Map1<From, To> extends Function<From, To>
+{
+ @Deprecated
+ default To map1(From input) {
+ return apply(input);
+ }
+
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/util/iterator/Map1Iterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/Map1Iterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/Map1Iterator.java
index ac90c3f..ea79c7a 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/Map1Iterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/Map1Iterator.java
@@ -19,6 +19,7 @@
package org.apache.jena.util.iterator;
import java.util.Iterator;
+import java.util.function.Function;
/**
An iterator that consumes an underlying iterator and maps its results before
@@ -27,7 +28,7 @@ import java.util.Iterator;
public class Map1Iterator<From, To> extends NiceIterator<To> implements ClosableIterator<To>
{
- private Map1<From, To> map;
+ private Function<From, To> map;
private Iterator<From> base;
/**
@@ -35,14 +36,14 @@ public class Map1Iterator<From, To> extends NiceIterator<To> implements Closable
* @param map The conversion to apply.
* @param base the iterator of elements to convert
*/
- public Map1Iterator( Map1<From, To> map, Iterator<From> base )
+ public Map1Iterator( Function<From, To> map, Iterator<From> base )
{
this.map = map;
this.base = base;
}
public @Override To next()
- { return map.map1( base.next() ); }
+ { return map.apply( base.next() ); }
public @Override boolean hasNext()
{ return base.hasNext(); }
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
index 23db070..6e0432f 100644
--- a/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
+++ b/jena-core/src/main/java/org/apache/jena/util/iterator/NiceIterator.java
@@ -19,6 +19,7 @@
package org.apache.jena.util.iterator;
import java.util.*;
+import java.util.function.Function;
/**
NiceIterator is the standard base class implementing ExtendedIterator. It provides
@@ -165,7 +166,7 @@ public class NiceIterator<T> implements ExtendedIterator<T>
make a new iterator which is the elementwise _map1_ of the base iterator.
*/
@Override
- public <U> ExtendedIterator<U> mapWith( Map1<T, U> map1 )
+ public <U> ExtendedIterator<U> mapWith( Function<T, U> map1 )
{ return new Map1Iterator<>( map1, this ); }
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java
index 3c2bdfa..bbe93e9 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestFindLiterals.java
@@ -27,18 +27,11 @@ import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
import org.apache.jena.graph.Triple ;
import org.apache.jena.graph.impl.LiteralLabelFactory ;
-import org.apache.jena.util.iterator.Map1 ;
public class TestFindLiterals extends GraphTestBase
{
public TestFindLiterals( String name )
{ super( name ); }
-
- static final Map1<Triple, Node> getObject = new Map1<Triple, Node>()
- {
- @Override
- public Node map1( Triple o ) { return o.getObject(); }
- };
public static TestFindLiterals aTest
( final String graph, final int size, final String search, final String results )
@@ -56,7 +49,7 @@ public class TestFindLiterals extends GraphTestBase
Node literal = NodeCreateUtils.create( search );
//
assertEquals( "graph has wrong size", size, g.size() );
- Set<Node> got = g.find( Node.ANY, Node.ANY, literal ).mapWith( getObject ).toSet();
+ Set<Node> got = g.find( Node.ANY, Node.ANY, literal ).mapWith( t -> t.getObject() ).toSet();
assertEquals( nodeSet( results ), got );
}
};
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
index c21d34e..16fbcd7 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
@@ -258,9 +258,9 @@ public class TestTriple extends GraphTestBase
public void testTripleMaps()
{
- assertEquals( node( "x" ), Triple.getSubject.map1( NodeCreateUtils.createTriple( "x P z" ) ) );
- assertEquals( node( "P" ), Triple.getPredicate.map1( NodeCreateUtils.createTriple( "x P z" ) ) );
- assertEquals( node( "z" ), Triple.getObject.map1( NodeCreateUtils.createTriple( "x P z" ) ) );
+ assertEquals( node( "x" ), Triple.getSubject.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
+ assertEquals( node( "P" ), Triple.getPredicate.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
+ assertEquals( node( "z" ), Triple.getObject.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestList.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestList.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestList.java
index 0672bbf..826c3aa 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestList.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestList.java
@@ -29,7 +29,6 @@ import java.util.List;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.rdf.model.test.helpers.TestingModelFactory ;
-import org.apache.jena.util.iterator.Map1 ;
import org.apache.jena.vocabulary.RDF ;
import org.junit.Assert;
import org.slf4j.Logger;
@@ -548,13 +547,7 @@ public class TestList extends AbstractModelTestBase
model.read(getFileName("ontology/list5.rdf"));
final RDFList root = getListRoot(model);
- TestList.iteratorTest(root.mapWith(new Map1<RDFNode, String>() {
- @Override
- public String map1( final RDFNode x )
- {
- return ((Resource) x).getLocalName();
- }
- }), new Object[] { "a", "b", "c", "d", "e" });
+ TestList.iteratorTest(root.mapWith(n ->((Resource) n).getLocalName()), new Object[] { "a", "b", "c", "d", "e" });
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
index dd0fef0..498f357 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
@@ -117,11 +117,11 @@ public class TestStatements extends AbstractModelTestBase
{
final Statement s = ModelHelper.statement("sub pred obj");
Assert.assertEquals(ModelHelper.resource("sub"),
- Statement.Util.getSubject.map1(s));
+ Statement.Util.getSubject.apply(s));
Assert.assertEquals(ModelHelper.resource("pred"),
- Statement.Util.getPredicate.map1(s));
+ Statement.Util.getPredicate.apply(s));
Assert.assertEquals(ModelHelper.resource("obj"),
- Statement.Util.getObject.map1(s));
+ Statement.Util.getObject.apply(s));
}
/**
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestMapIterators.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestMapIterators.java b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestMapIterators.java
index 333547a..ca1d9d4 100644
--- a/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestMapIterators.java
+++ b/jena-core/src/test/java/org/apache/jena/util/iterator/test/TestMapIterators.java
@@ -30,14 +30,8 @@ public class TestMapIterators extends ModelTestBase
public void testCloseClosesBaseIterator()
{
- Map1<String, String> map = new Map1<String, String>()
- {
- @Override
- public String map1( String o )
- { return null; }
- };
LoggingClosableIterator<String> base = new LoggingClosableIterator<>( null );
- Map1Iterator<String, String> mit = new Map1Iterator<>( map, base );
+ Map1Iterator<String, String> mit = new Map1Iterator<>( s -> null, base );
mit.close();
assertTrue( "base must have been closed by closing map", base.isClosed() );
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/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 0339c8b..1f7f969 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
@@ -35,7 +35,6 @@ import org.apache.jena.permissions.utils.ContainerFilter;
import org.apache.jena.permissions.utils.PermStatementFilter;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Map1 ;
import org.apache.jena.util.iterator.WrappedIterator ;
import org.apache.jena.vocabulary.RDF ;
@@ -342,7 +341,7 @@ public class SecuredContainerImpl extends SecuredResourceImpl implements
result.add( stmt );
}
}
- return new SecuredNodeIterator<RDFNode>(getModel(), new StatementRemovingIterator(result.iterator()).mapWith( new NodeMap() ) );
+ return new SecuredNodeIterator<RDFNode>(getModel(), new StatementRemovingIterator(result.iterator()).mapWith( s -> s.getObject() ) );
}
finally {
iter.close();
@@ -356,14 +355,7 @@ public class SecuredContainerImpl extends SecuredResourceImpl implements
final Set<Action> permsCopy = new HashSet<Action>(perms);
permsCopy.add(Action.Read);
final ExtendedIterator<RDFNode> ni = getStatementIterator(perms)
- .mapWith(new Map1<Statement, RDFNode>() {
-
- @Override
- public RDFNode map1( final Statement o )
- {
- return o.getObject();
- }
- });
+ .mapWith(o -> o.getObject());
return new SecuredNodeIterator<RDFNode>(getModel(), ni);
}
@@ -525,18 +517,7 @@ public class SecuredContainerImpl extends SecuredResourceImpl implements
*
* }
*/
-
- static class NodeMap implements Map1<Statement,RDFNode>
- {
- @Override
- public RDFNode map1( Statement o )
- {
- return o.getObject();
- }
-
- }
-
static class ContainerComparator implements Comparator<Statement>
{
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/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 33b0119..558f184 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
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.function.Function;
import org.apache.jena.permissions.model.SecuredModel;
import org.apache.jena.permissions.model.SecuredRDFNode;
@@ -28,14 +29,13 @@ import org.apache.jena.rdf.model.NodeIterator ;
import org.apache.jena.rdf.model.RDFNode ;
import org.apache.jena.util.iterator.ExtendedIterator ;
import org.apache.jena.util.iterator.Filter ;
-import org.apache.jena.util.iterator.Map1 ;
/**
* A secured RDFNode iterator implementation
*/
public class SecuredNodeIterator<T extends RDFNode> implements NodeIterator
{
- private class PermNodeMap<N extends RDFNode> implements Map1<N, RDFNode>
+ private class PermNodeMap<N extends RDFNode> implements Function<N, RDFNode>
{
private final SecuredModel securedModel;
@@ -45,7 +45,7 @@ public class SecuredNodeIterator<T extends RDFNode> implements NodeIterator
}
@Override
- public SecuredRDFNode map1( final RDFNode o )
+ public SecuredRDFNode apply( final RDFNode o )
{
return SecuredRDFNodeImpl.getInstance(securedModel, o);
}
@@ -100,7 +100,7 @@ public class SecuredNodeIterator<T extends RDFNode> implements NodeIterator
}
@Override
- public <U> ExtendedIterator<U> mapWith( final Map1<RDFNode, U> map1 )
+ public <U> ExtendedIterator<U> mapWith( final Function<RDFNode, U> map1 )
{
return iter.mapWith(map1);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/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 060dca4..8056c1e 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
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.function.Function;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.Triple ;
@@ -38,7 +39,6 @@ import org.apache.jena.permissions.utils.RDFListIterator;
import org.apache.jena.permissions.utils.RDFListSecFilter;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.util.iterator.ExtendedIterator ;
-import org.apache.jena.util.iterator.Map1 ;
import org.apache.jena.util.iterator.WrappedIterator ;
import org.apache.jena.vocabulary.RDF ;
@@ -46,11 +46,11 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements
SecuredRDFList
{
// called plain node but still returns a secured node
- private class PlainNodeMap implements Map1<RDFList, RDFNode>
+ private class PlainNodeMap implements Function<RDFList, RDFNode>
{
@Override
- public RDFNode map1( final RDFList o )
+ public RDFNode apply( final RDFList o )
{
return SecuredRDFNodeImpl.getInstance(getModel(), o
.getRequiredProperty(listFirst()).getObject());
@@ -58,18 +58,18 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements
}
- private class SecuredListMap implements Map1<RDFList, SecuredRDFList>
+ private class SecuredListMap implements Function<RDFList, SecuredRDFList>
{
@Override
- public SecuredRDFList map1( final RDFList o )
+ public SecuredRDFList apply( final RDFList o )
{
return SecuredRDFListImpl.getInstance(getModel(), o);
}
}
- private class SecuredNodeMap implements Map1<RDFList, SecuredRDFNode>
+ private class SecuredNodeMap implements Function<RDFList, SecuredRDFNode>
{
private Property p;
@@ -79,7 +79,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements
}
@Override
- public SecuredRDFNode map1( final RDFList o )
+ public SecuredRDFNode apply( final RDFList o )
{
return SecuredRDFNodeImpl.getInstance(getModel(), o
.getRequiredProperty(p).getObject());
@@ -525,16 +525,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements
if (canRead())
{
final ExtendedIterator<RDFNode> iter = getSecuredRDFListIterator(Action.Read)
- .mapWith( new Map1<RDFList, RDFNode>()
- {
-
- @Override
- public RDFNode map1( final RDFList o )
- {
- return o.getRequiredProperty(listFirst()).getObject();
- }
-
- });
+ .mapWith( list -> list.getRequiredProperty(listFirst()).getObject());
if (iter.hasNext())
{
retval = getModel().createList(iter);
@@ -756,7 +747,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements
}
@Override
- public <T> ExtendedIterator<T> mapWith( final Map1<RDFNode, T> fn )
+ public <T> ExtendedIterator<T> mapWith( final Function<RDFNode, T> fn )
{
return iterator().mapWith(fn);
}
@@ -917,7 +908,7 @@ public class SecuredRDFListImpl extends SecuredResourceImpl implements
if (i == idx)
{
final SecuredRDFList list = iter.next();
- final SecuredRDFNode retval = map.map1(list);
+ final SecuredRDFNode retval = map.apply(list);
final Triple t = new Triple(list.asNode(), listFirst()
.asNode(), retval.asNode());
final Triple t2 = new Triple(list.asNode(), listFirst()
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
index 6151b58..2160880 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredRSIterator.java
@@ -20,6 +20,7 @@ package org.apache.jena.permissions.model.impl;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.function.Function;
import org.apache.jena.permissions.SecurityEvaluator;
import org.apache.jena.permissions.SecurityEvaluator.Action;
@@ -30,7 +31,6 @@ import org.apache.jena.rdf.model.RSIterator ;
import org.apache.jena.rdf.model.ReifiedStatement ;
import org.apache.jena.util.iterator.ExtendedIterator ;
import org.apache.jena.util.iterator.Filter ;
-import org.apache.jena.util.iterator.Map1 ;
/**
* A secured RSIterator implementation
@@ -60,8 +60,7 @@ public class SecuredRSIterator implements RSIterator
}
- private class PermReifiedStatementMap implements
- Map1<ReifiedStatement, ReifiedStatement>
+ private class PermReifiedStatementMap implements Function<ReifiedStatement, ReifiedStatement>
{
private final SecuredModel securedModel;
@@ -71,7 +70,7 @@ public class SecuredRSIterator implements RSIterator
}
@Override
- public ReifiedStatement map1( final ReifiedStatement o )
+ public ReifiedStatement apply( final ReifiedStatement o )
{
return SecuredReifiedStatementImpl.getInstance(securedModel, o);
}
@@ -131,7 +130,7 @@ public class SecuredRSIterator implements RSIterator
}
@Override
- public <U> ExtendedIterator<U> mapWith( final Map1<ReifiedStatement, U> map1 )
+ public <U> ExtendedIterator<U> mapWith( final Function<ReifiedStatement, U> map1 )
{
return iter.mapWith(map1);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
index e681de3..4baa134 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredResIterator.java
@@ -20,6 +20,7 @@ package org.apache.jena.permissions.model.impl;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.function.Function;
import org.apache.jena.permissions.model.SecuredModel;
import org.apache.jena.permissions.model.SecuredResource;
@@ -27,12 +28,11 @@ import org.apache.jena.rdf.model.ResIterator ;
import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.util.iterator.ExtendedIterator ;
import org.apache.jena.util.iterator.Filter ;
-import org.apache.jena.util.iterator.Map1 ;
public class SecuredResIterator implements ResIterator
{
- private class PermResourceMap implements Map1<Resource, Resource>
+ private class PermResourceMap implements Function<Resource, Resource>
{
private final SecuredModel securedModel;
@@ -42,7 +42,7 @@ public class SecuredResIterator implements ResIterator
}
@Override
- public SecuredResource map1( final Resource o )
+ public SecuredResource apply( final Resource o )
{
return SecuredResourceImpl.getInstance(securedModel, o);
}
@@ -90,7 +90,7 @@ public class SecuredResIterator implements ResIterator
}
@Override
- public <U> ExtendedIterator<U> mapWith( final Map1<Resource, U> map1 )
+ public <U> ExtendedIterator<U> mapWith( final Function<Resource, U> map1 )
{
return iter.mapWith(map1);
}
http://git-wip-us.apache.org/repos/asf/jena/blob/65ce6b50/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
----------------------------------------------------------------------
diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
index 96a991d..81df811 100644
--- a/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
+++ b/jena-permissions/src/main/java/org/apache/jena/permissions/model/impl/SecuredStatementIterator.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.NoSuchElementException;
import java.util.Set;
+import java.util.function.Function;
import org.apache.jena.permissions.SecurityEvaluator.Action;
import org.apache.jena.permissions.model.SecuredModel;
@@ -30,7 +31,6 @@ import org.apache.jena.rdf.model.Statement ;
import org.apache.jena.rdf.model.StmtIterator ;
import org.apache.jena.util.iterator.ExtendedIterator ;
import org.apache.jena.util.iterator.Filter ;
-import org.apache.jena.util.iterator.Map1 ;
/**
* A secured StatementIterator implementation
@@ -38,7 +38,7 @@ import org.apache.jena.util.iterator.Map1 ;
public class SecuredStatementIterator implements StmtIterator
{
- private class PermStatementMap implements Map1<Statement, Statement>
+ private class PermStatementMap implements Function<Statement, Statement>
{
private final SecuredModel securedModel;
@@ -48,7 +48,7 @@ public class SecuredStatementIterator implements StmtIterator
}
@Override
- public SecuredStatement map1( final Statement o )
+ public SecuredStatement apply( final Statement o )
{
return SecuredStatementImpl.getInstance(securedModel, o);
}
@@ -105,7 +105,7 @@ public class SecuredStatementIterator implements StmtIterator
}
@Override
- public <U> ExtendedIterator<U> mapWith( final Map1<Statement, U> map1 )
+ public <U> ExtendedIterator<U> mapWith( final Function<Statement, U> map1 )
{
return iter.mapWith(map1);
}
[3/3] jena git commit: JENA-929: PR#54: Deprecating Map1 in favor of
Java8 Function
Posted by an...@apache.org.
JENA-929: PR#54: Deprecating Map1 in favor of Java8 Function
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3656b686
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3656b686
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3656b686
Branch: refs/heads/master
Commit: 3656b686b7f9cfcf21fa14bb337342021a74c8f7
Parents: 5b55795
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 1 14:24:08 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 1 14:24:08 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/jena/schemagen.java | 40 ++++++++++++--------
.../apache/jena/assembler/AssemblerHelp.java | 2 +-
.../apache/jena/assembler/ModelExpansion.java | 2 +-
.../assembler/assemblers/AssemblerGroup.java | 2 +-
.../main/java/org/apache/jena/graph/Triple.java | 10 ++---
.../apache/jena/ontology/impl/OntModelImpl.java | 1 -
.../org/apache/jena/rdf/model/Statement.java | 15 +-------
.../org/apache/jena/graph/test/TestTriple.java | 12 ++++--
.../jena/rdf/model/test/TestResources.java | 6 +--
.../jena/rdf/model/test/TestStatements.java | 11 ++----
10 files changed, 46 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/main/java/jena/schemagen.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/jena/schemagen.java b/jena-core/src/main/java/jena/schemagen.java
index 50240ed..29642bc 100644
--- a/jena-core/src/main/java/jena/schemagen.java
+++ b/jena-core/src/main/java/jena/schemagen.java
@@ -23,25 +23,33 @@ package jena;
// Imports
///////////////
-import static jena.cmdline.CmdLineUtils.setLog4jConfiguration;
-
-import java.io.*;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-import java.util.regex.PatternSyntaxException;
-
-import org.apache.jena.ontology.* ;
+import static jena.cmdline.CmdLineUtils.setLog4jConfiguration ;
+
+import java.io.ByteArrayOutputStream ;
+import java.io.File ;
+import java.io.FileOutputStream ;
+import java.io.PrintStream ;
+import java.net.MalformedURLException ;
+import java.net.URL ;
+import java.text.SimpleDateFormat ;
+import java.util.* ;
+import java.util.regex.Pattern ;
+import java.util.regex.PatternSyntaxException ;
+
+import org.apache.jena.ontology.Individual ;
+import org.apache.jena.ontology.OntModel ;
+import org.apache.jena.ontology.OntModelSpec ;
import org.apache.jena.rdf.model.* ;
import org.apache.jena.shared.JenaException ;
import org.apache.jena.util.FileManager ;
-import org.apache.jena.util.iterator.* ;
-import org.apache.jena.vocabulary.* ;
-import org.apache.xerces.util.XMLChar;
-import org.slf4j.LoggerFactory;
+import org.apache.jena.util.iterator.ExtendedIterator ;
+import org.apache.jena.util.iterator.WrappedIterator ;
+import org.apache.jena.vocabulary.OWL ;
+import org.apache.jena.vocabulary.RDF ;
+import org.apache.jena.vocabulary.RDFS ;
+import org.apache.jena.vocabulary.XSD ;
+import org.apache.xerces.util.XMLChar ;
+import org.slf4j.LoggerFactory ;
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java b/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
index 6c0ad5a..ac5d031 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/AssemblerHelp.java
@@ -208,7 +208,7 @@ public class AssemblerHelp
*/
public static Set<Resource> findSpecificTypes( Resource root, Resource baseType )
{
- List<RDFNode> types = root.listProperties( RDF.type ).mapWith( Statement.Util.getObject ).toList();
+ List<RDFNode> types = root.listProperties( RDF.type ).mapWith( Statement::getObject ).toList();
Set<Resource> results = new HashSet<>();
for (int i = 0; i < types.size(); i += 1)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/main/java/org/apache/jena/assembler/ModelExpansion.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/ModelExpansion.java b/jena-core/src/main/java/org/apache/jena/assembler/ModelExpansion.java
index 7fcce36..45f3712 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/ModelExpansion.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/ModelExpansion.java
@@ -270,7 +270,7 @@ public class ModelExpansion
private static Set<Resource> subjectSet( Model result, Resource S, Property P, RDFNode O )
{
- return result.listStatements( S, P, O ) .mapWith( Statement.Util.getSubject ).toSet();
+ return result.listStatements( S, P, O ) .mapWith( Statement::getSubject ).toSet();
}
private static List<RDFNode> asJavaList( Resource resource )
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerGroup.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerGroup.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerGroup.java
index 1daf679..02d21ca 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerGroup.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/AssemblerGroup.java
@@ -99,7 +99,7 @@ public abstract class AssemblerGroup extends AssemblerBase implements Assembler
public Set<Resource> implementsTypes()
{
- return implementTypes.listStatements().mapWith( Statement.Util.getSubject ).toSet(); }
+ return implementTypes.listStatements().mapWith( Statement::getSubject ).toSet(); }
}
static class PlainAssemblerGroup extends AssemblerGroup
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/main/java/org/apache/jena/graph/Triple.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/graph/Triple.java b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
index e3428f2..89d7238 100644
--- a/jena-core/src/main/java/org/apache/jena/graph/Triple.java
+++ b/jena-core/src/main/java/org/apache/jena/graph/Triple.java
@@ -19,7 +19,9 @@
package org.apache.jena.graph;
import org.apache.jena.shared.PrefixMapping ;
-import org.apache.jena.util.iterator.* ;
+import org.apache.jena.util.iterator.ExtendedIterator ;
+import org.apache.jena.util.iterator.Filter ;
+import org.apache.jena.util.iterator.NullIterator ;
/**
Triples are the basis for RDF statements; they have a subject, predicate, and
@@ -83,12 +85,6 @@ public class Triple
public Node getMatchSubject()
{ return anyToNull( subj ); }
- public static final Map1<Triple, Node> getSubject = t -> t.getSubject();
-
- public static final Map1<Triple, Node> getPredicate = t -> t.getPredicate();
-
- public static final Map1<Triple, Node> getObject = t -> t.getObject();
-
/** Return predicate or null, not Node.ANY */
public Node getMatchPredicate()
{ return anyToNull( pred ); }
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
index e6dc9af..458a945 100644
--- a/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/ontology/impl/OntModelImpl.java
@@ -28,7 +28,6 @@ import java.io.OutputStream ;
import java.io.Reader ;
import java.io.Writer ;
import java.util.* ;
-import java.util.function.Function;
import org.apache.jena.enhanced.BuiltinPersonalities ;
import org.apache.jena.enhanced.EnhNode ;
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
----------------------------------------------------------------------
diff --git a/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java b/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
index 14bb52b..376659d 100644
--- a/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
+++ b/jena-core/src/main/java/org/apache/jena/rdf/model/Statement.java
@@ -18,8 +18,7 @@
package org.apache.jena.rdf.model;
-import org.apache.jena.graph.* ;
-import org.apache.jena.util.iterator.Map1 ;
+import org.apache.jena.graph.FrontsTriple ;
/** An RDF Statement.
*
@@ -390,16 +389,4 @@ public interface Statement extends FrontsTriple
* removes all four triples of the reification quad.
*/
void removeReification();
-
- /**
- Utility constants -- in a nested class for namespace reasons.
- */
- public static class Util
- {
- public static final Map1<Statement, Resource> getSubject = s -> s.getSubject();
-
- public static final Map1<Statement, Property> getPredicate = s -> s.getPredicate();
-
- public static final Map1<Statement, RDFNode> getObject = s -> s.getObject();
- }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
index 16fbcd7..6d72c1d 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTriple.java
@@ -18,6 +18,8 @@
package org.apache.jena.graph.test;
+import java.util.function.Function ;
+
import junit.framework.TestSuite ;
import org.apache.jena.graph.Node ;
import org.apache.jena.graph.NodeFactory ;
@@ -258,10 +260,12 @@ public class TestTriple extends GraphTestBase
public void testTripleMaps()
{
- assertEquals( node( "x" ), Triple.getSubject.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
- assertEquals( node( "P" ), Triple.getPredicate.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
- assertEquals( node( "z" ), Triple.getObject.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
+ assertEquals( node( "x" ), getSubject.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
+ assertEquals( node( "P" ), getPredicate.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
+ assertEquals( node( "z" ), getObject.apply( NodeCreateUtils.createTriple( "x P z" ) ) );
}
-
+ public static final Function<Triple, Node> getSubject = t -> t.getSubject();
+ public static final Function<Triple, Node> getPredicate = t -> t.getPredicate();
+ public static final Function<Triple, Node> getObject = t -> t.getObject();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResources.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResources.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResources.java
index c0262f1..a010812 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResources.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResources.java
@@ -314,21 +314,21 @@ public class TestResources extends AbstractModelTestBase
Assert.assertEquals(13,
GraphTestBase.iteratorToSet(r.listProperties(RDF.value)).size());
Assert.assertEquals(setOf(r), GraphTestBase.iteratorToSet(r
- .listProperties(RDF.value).mapWith(Statement.Util.getSubject)));
+ .listProperties(RDF.value).mapWith(Statement::getSubject)));
//
Assert.assertEquals(0, GraphTestBase.iteratorToSet(r.listProperties(p))
.size());
Assert.assertEquals(
new HashSet<Resource>(),
GraphTestBase.iteratorToSet(r.listProperties(p).mapWith(
- Statement.Util.getSubject)));
+ Statement::getSubject)));
//
Assert.assertEquals(13 + numProps,
GraphTestBase.iteratorToSet(r.listProperties()).size());
Assert.assertEquals(
setOf(r),
GraphTestBase.iteratorToSet(r.listProperties().mapWith(
- Statement.Util.getSubject)));
+ Statement::getSubject)));
//
r.removeProperties();
Assert.assertEquals(0,
http://git-wip-us.apache.org/repos/asf/jena/blob/3656b686/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
index 498f357..06126aa 100644
--- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
+++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatements.java
@@ -115,13 +115,10 @@ public class TestStatements extends AbstractModelTestBase
public void testStatmentMap1Selectors()
{
- final Statement s = ModelHelper.statement("sub pred obj");
- Assert.assertEquals(ModelHelper.resource("sub"),
- Statement.Util.getSubject.apply(s));
- Assert.assertEquals(ModelHelper.resource("pred"),
- Statement.Util.getPredicate.apply(s));
- Assert.assertEquals(ModelHelper.resource("obj"),
- Statement.Util.getObject.apply(s));
+ final Statement stmt = ModelHelper.statement("sub pred obj");
+ Assert.assertEquals(ModelHelper.resource("sub"), stmt.getSubject());
+ Assert.assertEquals(ModelHelper.resource("pred"), stmt.getPredicate()) ;
+ Assert.assertEquals(ModelHelper.resource("obj"), stmt.getObject()) ;
}
/**
[2/3] jena git commit: This closes #54
Posted by an...@apache.org.
This closes #54
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5b557956
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5b557956
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5b557956
Branch: refs/heads/master
Commit: 5b557956f5ee69c51022ce21edab1afabd104c31
Parents: 3573bd7 65ce6b5
Author: Andy Seaborne <an...@apache.org>
Authored: Fri May 1 14:12:19 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri May 1 14:12:19 2015 +0100
----------------------------------------------------------------------
jena-core/src/main/java/jena/schemagen.java | 8 +-
.../assembler/assemblers/AssemblerBase.java | 17 +---
.../assembler/assemblers/ModelAssembler.java | 26 ++----
.../java/org/apache/jena/graph/GraphUtil.java | 30 +------
.../main/java/org/apache/jena/graph/Triple.java | 12 +--
.../apache/jena/mem/GraphTripleStoreBase.java | 6 +-
.../jena/ontology/impl/AllDifferentImpl.java | 7 +-
.../impl/BooleanClassDescriptionImpl.java | 2 +-
.../jena/ontology/impl/DataRangeImpl.java | 2 +-
.../jena/ontology/impl/EnumeratedClassImpl.java | 2 +-
.../jena/ontology/impl/IndividualImpl.java | 2 +-
.../apache/jena/ontology/impl/OntClassImpl.java | 4 +-
.../apache/jena/ontology/impl/OntModelImpl.java | 44 ++--------
.../jena/ontology/impl/OntPropertyImpl.java | 4 +-
.../jena/ontology/impl/OntResourceImpl.java | 91 +++-----------------
.../java/org/apache/jena/rdf/model/RDFList.java | 5 +-
.../org/apache/jena/rdf/model/Statement.java | 20 +----
.../jena/rdf/model/impl/IteratorFactory.java | 15 +---
.../apache/jena/rdf/model/impl/ModelCom.java | 13 +--
.../jena/rdf/model/impl/ModelReifier.java | 15 +---
.../apache/jena/rdf/model/impl/RDFListImpl.java | 3 +-
.../jena/rdfxml/xmloutput/impl/Relation.java | 27 +-----
.../jena/rdfxml/xmloutput/impl/Unparser.java | 12 +--
.../jena/util/iterator/ExtendedIterator.java | 3 +-
.../apache/jena/util/iterator/LazyIterator.java | 4 +-
.../org/apache/jena/util/iterator/Map1.java | 17 ++--
.../apache/jena/util/iterator/Map1Iterator.java | 7 +-
.../apache/jena/util/iterator/NiceIterator.java | 3 +-
.../jena/graph/test/TestFindLiterals.java | 9 +-
.../org/apache/jena/graph/test/TestTriple.java | 6 +-
.../apache/jena/rdf/model/test/TestList.java | 9 +-
.../jena/rdf/model/test/TestStatements.java | 6 +-
.../util/iterator/test/TestMapIterators.java | 8 +-
.../model/impl/SecuredContainerImpl.java | 23 +----
.../model/impl/SecuredNodeIterator.java | 8 +-
.../model/impl/SecuredRDFListImpl.java | 29 +++----
.../model/impl/SecuredRSIterator.java | 9 +-
.../model/impl/SecuredResIterator.java | 8 +-
.../model/impl/SecuredStatementIterator.java | 8 +-
39 files changed, 124 insertions(+), 400 deletions(-)
----------------------------------------------------------------------