You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/05/10 15:03:35 UTC
[06/50] [abbrv] jena git commit: JENA-929: PR#54: Deprecating Map1 in
favor of Java8 Function
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/add-contract-tests
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()) ;
}
/**