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/23 16:34:45 UTC
[1/3] jena git commit: Put ElementDataset under Element1
Repository: jena
Updated Branches:
refs/heads/master b9be4e0bf -> 134734535
Put ElementDataset under Element1
(ElementDataset is not used at the present time in
query parsing or execution.)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/9618da6f
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/9618da6f
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/9618da6f
Branch: refs/heads/master
Commit: 9618da6f70887e3320ca8e5604cbcf3487be83d6
Parents: 6419caa
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 23 15:07:19 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 23 15:07:19 2015 +0100
----------------------------------------------------------------------
.../jena/sparql/serializer/FormatterElement.java | 4 ++--
.../org/apache/jena/sparql/syntax/ElementDataset.java | 13 ++++---------
.../org/apache/jena/sparql/syntax/ElementWalker.java | 4 ++--
.../jena/sparql/syntax/RecursiveElementVisitor.java | 2 +-
4 files changed, 9 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/9618da6f/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
index cbe17ea..3136729 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/serializer/FormatterElement.java
@@ -177,8 +177,8 @@ public class FormatterElement extends FormatterBase
// out.decIndent(INDENT) ;
// out.newline() ;
// }
- if ( el.getPatternElement() != null )
- visitAsGroup(el.getPatternElement()) ;
+ if ( el.getElement() != null )
+ visitAsGroup(el.getElement()) ;
}
@Override
http://git-wip-us.apache.org/repos/asf/jena/blob/9618da6f/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementDataset.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementDataset.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementDataset.java
index d9aee90..d243333 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementDataset.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementDataset.java
@@ -25,29 +25,24 @@ import org.apache.jena.sparql.util.NodeIsomorphismMap ;
* (graph level version) with a query pattern.
* Unused in parser. */
-public class ElementDataset extends Element
+public class ElementDataset extends Element1
{
// Can keep either form - but not both.
// Helps because models have prefixes.
private DatasetGraph dataset = null ;
- private Element element = null ;
public ElementDataset(DatasetGraph data, Element patternElement)
{
+ super(patternElement) ;
this.dataset = data ;
- this.element = patternElement ;
}
public DatasetGraph getDataset() { return dataset ; }
- public void setDataset(DatasetGraph ds) { dataset = ds ; }
-
- public Element getPatternElement() { return element ; }
- public void setPatternElement(Element elt) { element = elt ; }
@Override
public int hashCode()
{
- int x = getPatternElement().hashCode() ;
+ int x = getElement().hashCode() ;
if ( getDataset() != null )
x ^= getDataset().hashCode() ;
return x ;
@@ -61,7 +56,7 @@ public class ElementDataset extends Element
return false ;
ElementDataset blk = (ElementDataset)el2 ;
- if ( ! element.equalTo(blk.getPatternElement(), isoMap) )
+ if ( ! getElement().equalTo(blk.getElement(), isoMap) )
return false ;
// Dataset both null
http://git-wip-us.apache.org/repos/asf/jena/blob/9618da6f/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java
index 1fb3ab5..1d875be 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/ElementWalker.java
@@ -143,8 +143,8 @@ public class ElementWalker
public void visit(ElementDataset el)
{
before(el) ;
- if ( el.getPatternElement() != null )
- el.getPatternElement().visit(this) ;
+ if ( el.getElement() != null )
+ el.getElement().visit(this) ;
proc.visit(el) ;
after(el) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/9618da6f/jena-arq/src/main/java/org/apache/jena/sparql/syntax/RecursiveElementVisitor.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/RecursiveElementVisitor.java b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/RecursiveElementVisitor.java
index cdda2ce..ceefa28 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/syntax/RecursiveElementVisitor.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/syntax/RecursiveElementVisitor.java
@@ -118,7 +118,7 @@ public class RecursiveElementVisitor implements ElementVisitor
public final void visit(ElementDataset el)
{
startElement(el) ;
- el.getPatternElement().visit(this) ;
+ el.getElement().visit(this) ;
endElement(el) ;
}
[2/3] jena git commit: JENA-380 : Remove warnings
Posted by an...@apache.org.
JENA-380 : Remove warnings
Javadoc errors
Unnecessary semicolons
Unthrown exceptions
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/1e2ea5e1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/1e2ea5e1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/1e2ea5e1
Branch: refs/heads/master
Commit: 1e2ea5e1e78b8ca581fbbedcd7f3321fefc19fd9
Parents: 9618da6
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 23 15:15:40 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 23 15:15:40 2015 +0100
----------------------------------------------------------------------
.../jena/assembler/test/TestAssemblerGroup.java | 18 ++++++-----
.../apache/jena/graph/GraphContractTest.java | 20 +++++-------
.../AbstractGraphProducer.java | 7 +++--
.../AbstractInfModelProducer.java | 2 +-
.../AbstractModelProducer.java | 5 +--
.../AbstractRecordingListener.java | 2 +-
.../testing_framework/IIteratorProducer.java | 8 ++---
.../jena/testing_framework/ModelHelper.java | 12 ++------
.../jena/testing_framework/TestFileData.java | 10 +++---
.../jena/testing_framework/TestUtils.java | 4 +--
.../testing_framework/manifest/Manifest.java | 32 ++++++++++----------
.../manifest/ManifestItemHandler.java | 7 ++---
12 files changed, 58 insertions(+), 69 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
index 8b38e5a..f0df74c 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestAssemblerGroup.java
@@ -18,15 +18,19 @@
package org.apache.jena.assembler.test;
-import java.util.Map;
-
-import org.apache.jena.assembler.* ;
-import org.apache.jena.assembler.assemblers.* ;
-import org.apache.jena.assembler.assemblers.AssemblerGroup.ExpandingAssemblerGroup;
-import org.apache.jena.assembler.exceptions.* ;
+import org.apache.jena.assembler.Assembler ;
+import org.apache.jena.assembler.JA ;
+import org.apache.jena.assembler.Mode ;
+import org.apache.jena.assembler.assemblers.AssemblerBase ;
+import org.apache.jena.assembler.assemblers.AssemblerGroup ;
+import org.apache.jena.assembler.assemblers.AssemblerGroup.ExpandingAssemblerGroup ;
+import org.apache.jena.assembler.assemblers.InfModelAssembler ;
+import org.apache.jena.assembler.exceptions.NoSpecificTypeException ;
import org.apache.jena.graph.Graph ;
import org.apache.jena.mem.GraphMemBase ;
-import org.apache.jena.rdf.model.* ;
+import org.apache.jena.rdf.model.InfModel ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.Resource ;
import org.apache.jena.vocabulary.RDFS ;
public class TestAssemblerGroup extends AssemblerTestBase
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java b/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
index bf4ccf2..d724e6b 100644
--- a/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
@@ -1213,11 +1213,11 @@ public class GraphContractTest<T extends Graph> extends
/**
* testIsomorphism from file data
*
- * @throws FileNotFoundException
+ * @throws URISyntaxException
+ * @throws MalformedURLException
*/
@ContractTest
- public void testIsomorphismFile() throws URISyntaxException,
- MalformedURLException {
+ public void testIsomorphismFile() throws URISyntaxException, MalformedURLException {
testIsomorphismXMLFile(1, true);
testIsomorphismXMLFile(2, true);
testIsomorphismXMLFile(3, true);
@@ -1229,28 +1229,22 @@ public class GraphContractTest<T extends Graph> extends
}
- private void testIsomorphismNTripleFile(int i, boolean result)
- throws URISyntaxException, MalformedURLException {
+ private void testIsomorphismNTripleFile(int i, boolean result) {
testIsomorphismFile(i, "N-TRIPLE", "nt", result);
}
- private void testIsomorphismXMLFile(int i, boolean result)
- throws URISyntaxException, MalformedURLException {
+ private void testIsomorphismXMLFile(int i, boolean result) {
testIsomorphismFile(i, "RDF/XML", "rdf", result);
-
}
- private InputStream getInputStream(int n, int n2, String suffix)
- throws URISyntaxException, MalformedURLException {
+ private InputStream getInputStream(int n, int n2, String suffix) {
String urlStr = String.format("regression/testModelEquals/%s-%s.%s", n,
n2, suffix);
return GraphContractTest.class.getClassLoader().getResourceAsStream(
urlStr);
}
- private void testIsomorphismFile(int n, String lang, String suffix,
- boolean result) throws URISyntaxException, MalformedURLException {
-
+ private void testIsomorphismFile(int n, String lang, String suffix, boolean result) {
Graph g1 = getProducer().newInstance();
Graph g2 = getProducer().newInstance();
Model m1 = ModelFactory.createModelForGraph(g1);
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractGraphProducer.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractGraphProducer.java b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractGraphProducer.java
index 29cf9f0..480811a 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractGraphProducer.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractGraphProducer.java
@@ -66,7 +66,7 @@ public abstract class AbstractGraphProducer<T extends Graph> implements
* The graph that is closed
*/
protected void afterClose(Graph g) {
- };
+ }
@Override
final public void cleanUp() {
@@ -86,7 +86,7 @@ public abstract class AbstractGraphProducer<T extends Graph> implements
*
* @param g
* The graph we are looking for.
- * @return
+ * @return Graph[]
*/
public abstract Graph[] getDependsOn(Graph g);
@@ -97,7 +97,8 @@ public abstract class AbstractGraphProducer<T extends Graph> implements
*
* @param g
* The graph we are looking for.
- * @return
+ * @return
+ * Graph[]
*/
public abstract Graph[] getNotDependsOn(Graph g);
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractInfModelProducer.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractInfModelProducer.java b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractInfModelProducer.java
index 898503d..b8d3a5c 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractInfModelProducer.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractInfModelProducer.java
@@ -48,7 +48,7 @@ public abstract class AbstractInfModelProducer<T extends InfModel> extends
/**
* Returns the model that was used in the reasoner.bind() call.
*
- * @return
+ * @return Model
*/
abstract public Model getBoundModel();
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractModelProducer.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractModelProducer.java b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractModelProducer.java
index 882e9d3..d111b40 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractModelProducer.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractModelProducer.java
@@ -72,9 +72,10 @@ public abstract class AbstractModelProducer<T extends Model> implements
* The graph that is closed
*/
protected void afterClose(T g) {
- };
+ }
- @Override
+ @SuppressWarnings("unchecked")
+ @Override
final public void cleanUp() {
for (Model m : modelList) {
if (!m.isClosed()) {
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java
index e9e26a1..09a55e9 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/AbstractRecordingListener.java
@@ -184,7 +184,7 @@ public class AbstractRecordingListener {
public final Iterator<Object> from(Object start) {
Iterator<Object> iter = history.iterator();
while (iter.hasNext() && !iter.next().equals(start))
- ; // loop
+ {}
return iter;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/IIteratorProducer.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/IIteratorProducer.java b/jena-core/src/test/java/org/apache/jena/testing_framework/IIteratorProducer.java
index 8e17cec..5d9af00 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/IIteratorProducer.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/IIteratorProducer.java
@@ -27,7 +27,7 @@ public interface IIteratorProducer<T> {
/**
* Get a new instance of the iterator.
*
- * @return
+ * @return ExtendedIterator
*/
public ExtendedIterator<T> newInstance();
@@ -39,14 +39,14 @@ public interface IIteratorProducer<T> {
/**
* The list of items found in the iterator. Does not have to be in order.
*
- * @return
+ * @return List
*/
public List<T> getList();
/**
* True if delete is supported by the iterator
*
- * @return
+ * @return boolean
*/
public boolean supportsDelete();
@@ -54,7 +54,7 @@ public interface IIteratorProducer<T> {
* True if this is an iterator on a copy so that delete works but getting a
* new copy for the iterator test will return the original list.
*
- * @return
+ * @return boolean
*/
public boolean isCopy();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/ModelHelper.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/ModelHelper.java b/jena-core/src/test/java/org/apache/jena/testing_framework/ModelHelper.java
index 2f35203..2972986 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/ModelHelper.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/ModelHelper.java
@@ -140,8 +140,6 @@ public class ModelHelper extends GraphHelper {
/**
* Create an array of Statements parsed from a semi-separated string.
*
- * @param lockModel
- * a model to serve as a statement factory
* @param facts
* a sequence of semicolon-separated "S P O" facts
* @return a Statement[] of the (S P O) statements from the string
@@ -214,7 +212,7 @@ public class ModelHelper extends GraphHelper {
* does all insertions in a transaction.
*
* @param facts
- * @return
+ * @return Model
*/
public static Model memModel(String facts) {
Model model = ModelFactory.createMemModelMaker().createFreshModel();
@@ -248,11 +246,7 @@ public class ModelHelper extends GraphHelper {
* Creates a model with extended prefixes and initialises it with statements
* parsed from the statement iterator.
*
- * does all insertions in a transaction.
- *
- * @param facts
- * a string in semicolon-separated "S P O" format
- * @return a model containing those facts
+ * Does all insertions in a transaction.
*/
public static Model modelWithStatements(
IProducer<? extends Model> producer, final StmtIterator it) {
@@ -283,8 +277,6 @@ public class ModelHelper extends GraphHelper {
* the model value that is expected
* @param got
* the model value to check
- * @exception if
- * the models are not isomorphic
*/
public static void assertIsoModels(String title, Model wanted, Model got) {
if (wanted.isIsomorphicWith(got) == false) {
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java b/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
index d839c82..da72e42 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/TestFileData.java
@@ -321,11 +321,11 @@ public class TestFileData {
throws IOException {
File f = File.createTempFile("tfd", extension);
f.deleteOnExit();
- FileOutputStream fos = new FileOutputStream(f);
- // fos.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes());
- // fos.write(System.getProperty("line.separator").getBytes());
- fos.write(data.getBytes());
- fos.close();
+ try (FileOutputStream fos = new FileOutputStream(f); ) {
+ // fos.write("<?xml version=\"1.0\" encoding=\"UTF-8\"?>".getBytes());
+ // fos.write(System.getProperty("line.separator").getBytes());
+ fos.write(data.getBytes());
+ }
return f.toURI().toURL().toExternalForm();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java b/jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java
index 78d4bab..e862c9f 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/TestUtils.java
@@ -39,14 +39,14 @@ import org.apache.jena.util.iterator.ExtendedIterator;
import org.apache.jena.util.iterator.WrappedIterator;
/**
- * Foo basis for Jena test cases which provides assertFalse and assertDiffer.
+ * Basis for Jena test cases which provides assertFalse and assertDiffer.
* Often the logic of the names is clearer than using a negation.
*/
public class TestUtils {
// do not instantiate
protected TestUtils() {
throw new UnsupportedOperationException("Do not instantiate TestUtils");
- };
+ }
/**
* assert that the two objects must be unequal according to .equals().
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/Manifest.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/Manifest.java b/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/Manifest.java
index 79d2fce..9ff4354 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/Manifest.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/Manifest.java
@@ -18,26 +18,26 @@
package org.apache.jena.testing_framework.manifest;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.apache.jena.n3.IRIResolver;
-import org.apache.jena.rdf.model.*;
-import org.apache.jena.util.FileManager;
-import org.apache.jena.vocabulary.RDF;
-import org.apache.jena.vocabulary.RDFS;
-import org.apache.jena.vocabulary.TestManifest;
-import org.apache.jena.vocabulary.TestManifestX;
+import java.util.ArrayList ;
+import java.util.Collection ;
+import java.util.Iterator ;
+import java.util.List ;
+
+import org.apache.jena.n3.IRIResolver ;
+import org.apache.jena.rdf.model.* ;
+import org.apache.jena.util.FileManager ;
+import org.apache.jena.vocabulary.RDF ;
+import org.apache.jena.vocabulary.RDFS ;
+import org.apache.jena.vocabulary.TestManifest ;
+import org.apache.jena.vocabulary.TestManifestX ;
+import org.slf4j.Logger ;
+import org.slf4j.LoggerFactory ;
/**
* A test manifest for a single manifest file.
*/
+@SuppressWarnings("deprecation")
public class Manifest {
// This class does not know about JUnit.
private static Logger log = LoggerFactory.getLogger(Manifest.class);
@@ -47,7 +47,7 @@ public class Manifest {
private List<String> includedFiles = new ArrayList<String>();
private Resource manifestRes = null;
- public Manifest(String fn) {
+ public Manifest(String fn) {
log.debug("Manifest = " + fn);
filename = IRIResolver.resolveGlobal(fn);
log.debug(" = " + filename);
http://git-wip-us.apache.org/repos/asf/jena/blob/1e2ea5e1/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/ManifestItemHandler.java
----------------------------------------------------------------------
diff --git a/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/ManifestItemHandler.java b/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/ManifestItemHandler.java
index 08ce69f..f322867 100644
--- a/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/ManifestItemHandler.java
+++ b/jena-core/src/test/java/org/apache/jena/testing_framework/manifest/ManifestItemHandler.java
@@ -18,16 +18,13 @@
package org.apache.jena.testing_framework.manifest;
-import java.util.List;
+import java.util.List ;
-import org.junit.runner.Runner;
-import org.junit.runners.model.InitializationError;
+import org.junit.runner.Runner ;
public interface ManifestItemHandler {
/**
* Handle an item in a manifest
- *
- * @throws InitializationError
*/
public void processManifestItem(ManifestItem item);
[3/3] jena git commit: JENA-380 : Resolve merge
Posted by an...@apache.org.
JENA-380 : Resolve merge
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/13473453
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/13473453
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/13473453
Branch: refs/heads/master
Commit: 13473453583ccf8ff8a81d434aff868c5d2f6ba4
Parents: 1e2ea5e b9be4e0
Author: Andy Seaborne <an...@apache.org>
Authored: Sat May 23 15:34:19 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat May 23 15:34:19 2015 +0100
----------------------------------------------------------------------
.../apache/jena/graph/GraphContractTest.java | 269 ++++++++++---------
.../graph/GraphEventManagerContractTest.java | 12 +-
.../graph/GraphWithPerformContractTest.java | 19 +-
.../graph/impl/TripleStoreContractTest.java | 12 +-
.../testing_framework/ContractTemplate.java | 35 ---
5 files changed, 163 insertions(+), 184 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/13473453/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
----------------------------------------------------------------------
diff --cc jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
index d724e6b,5a43f74..6f02750
--- a/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
+++ b/jena-core/src/test/java/org/apache/jena/graph/GraphContractTest.java
@@@ -18,44 -18,44 +18,56 @@@
package org.apache.jena.graph;
--import java.io.InputStream;
--import java.net.MalformedURLException;
--import java.net.URISyntaxException;
--import java.util.Arrays;
--import java.util.Iterator;
--import java.util.List;
--import java.util.Set;
--import java.util.function.Function;
--
--import org.junit.After;
--import org.slf4j.Logger;
--import org.slf4j.LoggerFactory;
--import org.xenei.junit.contract.Contract;
--import org.xenei.junit.contract.ContractTest;
-import org.xenei.junit.contract.IProducer;
--
--import static org.junit.Assert.*;
--
--import org.apache.jena.graph.Capabilities;
--import org.apache.jena.graph.Graph;
--import org.apache.jena.graph.GraphStatisticsHandler;
--import org.apache.jena.graph.GraphUtil;
--import org.apache.jena.graph.Node;
--import org.apache.jena.graph.Triple;
--import org.apache.jena.graph.impl.LiteralLabelFactory;
--import org.apache.jena.mem.TrackingTripleIterator;
--import org.apache.jena.rdf.model.Model;
--import org.apache.jena.rdf.model.ModelFactory;
--import org.apache.jena.rdf.model.impl.ReifierStd;
--import org.apache.jena.shared.ClosedException;
--import org.apache.jena.shared.DeleteDeniedException;
--import org.apache.jena.shared.PrefixMapping;
--import org.apache.jena.testing_framework.AbstractGraphProducer;
- import org.apache.jena.testing_framework.ContractTemplate;
--import org.apache.jena.testing_framework.NodeCreateUtils;
--import org.apache.jena.util.iterator.ClosableIterator;
--import org.apache.jena.util.iterator.ExtendedIterator;
--
--import static org.apache.jena.testing_framework.GraphHelper.*;
++import static org.apache.jena.testing_framework.GraphHelper.assertContainsAll ;
++import static org.apache.jena.testing_framework.GraphHelper.assertIsomorphic ;
++import static org.apache.jena.testing_framework.GraphHelper.assertOmitsAll ;
++import static org.apache.jena.testing_framework.GraphHelper.graphAddTxn ;
++import static org.apache.jena.testing_framework.GraphHelper.graphWith ;
++import static org.apache.jena.testing_framework.GraphHelper.iteratorToSet ;
++import static org.apache.jena.testing_framework.GraphHelper.memGraph ;
++import static org.apache.jena.testing_framework.GraphHelper.node ;
++import static org.apache.jena.testing_framework.GraphHelper.nodeSet ;
++import static org.apache.jena.testing_framework.GraphHelper.triple ;
++import static org.apache.jena.testing_framework.GraphHelper.tripleArray ;
++import static org.apache.jena.testing_framework.GraphHelper.tripleSet ;
++import static org.apache.jena.testing_framework.GraphHelper.txnBegin ;
++import static org.apache.jena.testing_framework.GraphHelper.txnCommit ;
++import static org.apache.jena.testing_framework.GraphHelper.txnRollback ;
++import static org.apache.jena.testing_framework.TestUtils.assertDiffer ;
++import static org.junit.Assert.assertEquals ;
++import static org.junit.Assert.assertFalse ;
++import static org.junit.Assert.assertNotEquals ;
++import static org.junit.Assert.assertNotNull ;
++import static org.junit.Assert.assertSame ;
++import static org.junit.Assert.assertTrue ;
++import static org.junit.Assert.fail ;
++
++import java.io.InputStream ;
++import java.net.MalformedURLException ;
++import java.net.URISyntaxException ;
++import java.util.Arrays ;
++import java.util.Iterator ;
++import java.util.List ;
++import java.util.Set ;
++import java.util.function.Function ;
++
++import org.apache.jena.graph.impl.LiteralLabelFactory ;
++import org.apache.jena.mem.TrackingTripleIterator ;
++import org.apache.jena.rdf.model.Model ;
++import org.apache.jena.rdf.model.ModelFactory ;
++import org.apache.jena.rdf.model.impl.ReifierStd ;
++import org.apache.jena.shared.ClosedException ;
++import org.apache.jena.shared.DeleteDeniedException ;
++import org.apache.jena.shared.PrefixMapping ;
++import org.apache.jena.testing_framework.AbstractGraphProducer ;
++import org.apache.jena.testing_framework.NodeCreateUtils ;
++import org.apache.jena.util.iterator.ClosableIterator ;
++import org.apache.jena.util.iterator.ExtendedIterator ;
++import org.junit.After ;
++import org.slf4j.Logger ;
++import org.slf4j.LoggerFactory ;
++import org.xenei.junit.contract.Contract ;
++import org.xenei.junit.contract.ContractTest ;
/**
* Graph contract test.
@@@ -1244,9 -1249,11 +1257,9 @@@ public class GraphContractTest<T extend
urlStr);
}
- private void testIsomorphismFile(int n, String lang, String suffix,
- boolean result) throws URISyntaxException, MalformedURLException {
-
+ private void testIsomorphismFile(int n, String lang, String suffix, boolean result) {
- Graph g1 = getProducer().newInstance();
- Graph g2 = getProducer().newInstance();
+ Graph g1 = producer.newInstance();
+ Graph g2 = producer.newInstance();
Model m1 = ModelFactory.createModelForGraph(g1);
Model m2 = ModelFactory.createModelForGraph(g2);