From c80165193df3c5f47d159524c5482093bd703033 Mon Sep 17 00:00:00 2001 From: ajs6f Date: Mon, 11 May 2015 11:21:55 -0400 Subject: [PATCH 1/3] JENA-938: Nonfunctional cleanup in various modules Remove some forms of dead code from jena-arq, jena-base, jena-core, jena-csv, jena-iri, an jena-permissions. Includes removals for: Unthrown checked exceptions Unnecessary superinterface declarations Needless typecasts Unused imports --- .../org/apache/jena/atlas/data/DataBag.java | 3 +- .../org/apache/jena/atlas/json/JsonArray.java | 2 +- .../atlas/json/io/parser/TokenizerJSON.java | 5 +- .../jena/riot/lang/CollectorStreamQuads.java | 3 +- .../riot/lang/CollectorStreamTriples.java | 3 +- .../jena/riot/lang/PipedQuadsStream.java | 3 +- .../jena/riot/lang/PipedTriplesStream.java | 3 +- .../jena/riot/lang/PipedTuplesStream.java | 3 +- .../apache/jena/riot/out/JenaRDF2JSONLD.java | 3 +- .../jena/riot/out/SinkQuadBracedOutput.java | 3 +- .../apache/jena/riot/system/IRIResolver.java | 4 +- .../riot/system/IteratorStreamRDFText.java | 2 +- .../riot/system/StreamRDFCountingBase.java | 2 +- .../jena/riot/thrift/IteratorThriftRDF.java | 4 +- .../jena/riot/thrift/Thift2Binding.java | 3 +- .../apache/jena/riot/thrift/wire/RDF_ANY.java | 24 +--- .../jena/riot/thrift/wire/RDF_BNode.java | 18 +-- .../jena/riot/thrift/wire/RDF_DataTuple.java | 17 +-- .../jena/riot/thrift/wire/RDF_Decimal.java | 19 +-- .../apache/jena/riot/thrift/wire/RDF_IRI.java | 18 +-- .../jena/riot/thrift/wire/RDF_Literal.java | 17 +-- .../jena/riot/thrift/wire/RDF_PrefixDecl.java | 18 +-- .../jena/riot/thrift/wire/RDF_PrefixName.java | 18 +-- .../jena/riot/thrift/wire/RDF_Quad.java | 17 +-- .../jena/riot/thrift/wire/RDF_REPEAT.java | 24 +--- .../jena/riot/thrift/wire/RDF_StreamRow.java | 19 +-- .../jena/riot/thrift/wire/RDF_Term.java | 19 +-- .../jena/riot/thrift/wire/RDF_Triple.java | 29 ++--- .../jena/riot/thrift/wire/RDF_UNDEF.java | 23 +--- .../apache/jena/riot/thrift/wire/RDF_VAR.java | 21 +--- .../jena/riot/thrift/wire/RDF_VarTuple.java | 20 +--- .../org/apache/jena/sparql/algebra/Op.java | 3 +- .../core/assembler/DatasetAssembler.java | 2 +- .../DatasetDescriptionAssembler.java | 2 +- .../core/assembler/DatasetNullAssembler.java | 2 +- .../sparql/engine/iterator/QueryIterSort.java | 3 +- .../sparql/function/CastXSD_DateTime.java | 2 +- .../apache/jena/sparql/graph/GraphSPARQL.java | 2 +- .../jena/sparql/graph/GraphSPARQLService.java | 3 +- .../jena/sparql/lang/arq/ARQParser.java | 2 +- .../sparql/lang/sparql_10/SPARQLParser10.java | 2 +- .../sparql/lang/sparql_11/SPARQLParser11.java | 2 +- .../apache/jena/sparql/mgt/ContextMBean.java | 8 +- .../sparql/modify/UpdateProcessRemote.java | 3 +- .../modify/UpdateProcessRemoteForm.java | 3 +- .../jena/sparql/resultset/XMLInputSAX.java | 20 ++-- .../jena/web/DatasetGraphAccessorHTTP.java | 3 +- jena-arq/src/main/java/riotcmd/utf8.java | 5 - .../jena/riot/lang/TestPipedRDFIterators.java | 6 +- .../jena/riot/system/TestIO_JenaReaders.java | 4 +- .../jena/riot/system/TestIO_JenaWriters.java | 4 +- .../sparql/core/TestDatasetGraphWithLock.java | 4 +- .../sparql/engine/index/TestIndexTable.java | 4 +- .../jena/sparql/junit/EarlTestCase.java | 8 +- .../apache/jena/sparql/junit/QueryTest.java | 10 +- .../jena/sparql/junit/SurpressedTest.java | 2 +- .../apache/jena/sparql/junit/SyntaxTest.java | 2 +- .../jena/sparql/junit/SyntaxUpdateTest.java | 2 +- .../jena/sparql/junit/TestSerialization.java | 2 +- .../apache/jena/sparql/junit/UpdateTest.java | 6 +- .../apache/jena/sparql/util/TestFmtUtils.java | 6 +- .../apache/jena/atlas/io/BufferingWriter.java | 10 +- .../jena/atlas/io/CharStreamReader.java | 7 +- .../apache/jena/atlas/io/InStreamASCII.java | 4 +- .../apache/jena/atlas/io/InStreamUTF8.java | 4 +- .../apache/jena/atlas/io/IndentedWriter.java | 3 +- .../jena/atlas/io/InputStreamBuffered.java | 2 +- .../apache/jena/atlas/io/PeekInputStream.java | 10 +- .../org/apache/jena/atlas/io/PeekReader.java | 6 +- .../org/apache/jena/atlas/io/Writer2.java | 4 +- .../org/apache/jena/atlas/iterator/Iter.java | 4 +- .../jena/atlas/lib/TestDateTimeUtils.java | 10 +- .../assembler/assemblers/AssemblerGroup.java | 2 +- .../assemblers/ContentAssembler.java | 2 +- .../assemblers/DefaultModelAssembler.java | 2 +- .../assemblers/MemoryModelAssembler.java | 2 +- .../assembler/assemblers/ModelAssembler.java | 2 +- .../assemblers/OntModelAssembler.java | 2 +- .../assemblers/OntModelSpecAssembler.java | 2 +- .../assemblers/PrefixMappingAssembler.java | 2 +- .../assemblers/ReasonerFactoryAssembler.java | 2 +- .../assemblers/RuleSetAssembler.java | 2 +- .../assemblers/UnionModelAssembler.java | 2 +- .../datatypes/xsd/impl/RDFLangString.java | 2 +- .../datatypes/xsd/impl/XMLLiteralType.java | 2 +- .../org/apache/jena/graph/compose/Delta.java | 2 +- .../apache/jena/graph/compose/Difference.java | 2 +- .../jena/graph/compose/Intersection.java | 2 +- .../compose/PolyadicPrefixMappingImpl.java | 2 +- .../org/apache/jena/graph/compose/Union.java | 2 +- .../org/apache/jena/mem/GraphTripleStore.java | 3 +- .../apache/jena/mem/GraphTripleStoreMem.java | 3 +- .../jena/ontology/AnnotationProperty.java | 8 +- .../apache/jena/rdf/model/impl/ModelCom.java | 3 +- .../apache/jena/rdfxml/xmlinput/StAX2SAX.java | 14 +-- .../xmlinput/impl/ARPSaxErrorHandler.java | 7 +- .../rdfxml/xmlinput/impl/AttributeLexer.java | 3 +- .../xmlinput/impl/DefaultErrorHandler.java | 4 +- .../xmlinput/impl/LexicalHandlerImpl.java | 17 ++- .../rdfxml/xmlinput/impl/SAX2RDFImpl.java | 19 ++- .../xmlinput/impl/XMLBaselessContext.java | 3 +- .../jena/rdfxml/xmlinput/impl/XMLContext.java | 3 +- .../jena/rdfxml/xmlinput/impl/XMLHandler.java | 3 +- .../rdfxml/xmlinput/states/AbsXMLLiteral.java | 2 +- .../jena/rdfxml/xmlinput/states/Frame.java | 10 +- .../xmlinput/states/WantTypedLiteral.java | 2 +- .../apache/jena/reasoner/BaseInfGraph.java | 2 +- .../reasoner/rulesys/OWLMicroReasoner.java | 2 +- .../reasoner/rulesys/OWLMiniReasoner.java | 2 +- .../jena/reasoner/rulesys/impl/SafeGraph.java | 2 +- .../TransitiveGraphCache.java | 4 +- .../jena/util/iterator/Map1Iterator.java | 2 +- .../jena/util/iterator/MapFilterIterator.java | 2 +- .../jena/util/iterator/SingletonIterator.java | 2 +- .../test/TestReasonerFactoryAssembler.java | 2 +- .../jena/graph/test/TestTypedLiterals.java | 4 +- .../jena/ontology/impl/TestAllDifferent.java | 2 +- .../ontology/impl/TestClassExpression.java | 112 +++++++++--------- .../jena/ontology/impl/TestIndividual.java | 42 +++---- .../jena/ontology/impl/TestOntTools.java | 3 +- .../jena/ontology/impl/TestOntology.java | 8 +- .../jena/ontology/impl/TestProperty.java | 54 ++++----- .../jena/ontology/impl/TestResource.java | 50 ++++---- .../model/test/AbstractContainerMethods.java | 2 +- .../rdf/model/test/AbstractModelTestBase.java | 4 +- .../jena/rdf/model/test/IsomorphicTests.java | 4 +- .../rdf/model/test/TestAddAndContains.java | 4 +- .../jena/rdf/model/test/TestAddModel.java | 4 +- .../jena/rdf/model/test/TestConcurrency.java | 4 +- .../model/test/TestConcurrencyNesting.java | 2 +- .../model/test/TestConcurrencyParallel.java | 2 +- .../rdf/model/test/TestCopyInOutOfModel.java | 2 +- .../apache/jena/rdf/model/test/TestGet.java | 4 +- .../jena/rdf/model/test/TestIterators.java | 2 +- .../rdf/model/test/TestListStatements.java | 4 +- .../jena/rdf/model/test/TestListSubjects.java | 2 +- .../rdf/model/test/TestLiteralsInModel.java | 2 +- .../jena/rdf/model/test/TestModelEvents.java | 2 +- .../model/test/TestModelSetOperations.java | 4 +- .../model/test/TestObjectOfProperties.java | 2 +- .../jena/rdf/model/test/TestObjects.java | 4 +- .../rdf/model/test/TestReifiedStatements.java | 2 +- .../rdf/model/test/TestResourceMethods.java | 2 +- .../jena/rdf/model/test/TestSelectorUse.java | 2 +- .../jena/rdf/model/test/TestSeqMethods.java | 2 +- .../model/test/TestSimpleListStatements.java | 2 +- .../rdf/model/test/TestSimpleSelector.java | 2 +- .../rdf/model/test/TestStatementCreation.java | 4 +- .../rdf/model/test/TestStatementMethods.java | 2 +- .../jena/rdfxml/xmlinput/MemoryLeakTest.java | 3 +- .../jena/rdfxml/xmlinput/MoreTests.java | 4 +- .../rdfxml/xmlinput/NTripleTestSuite.java | 10 +- .../jena/rdfxml/xmlinput/WGTestSuite.java | 14 ++- .../rdfxml/xmlinput/states/TestEventList.java | 2 +- .../rdfxml/xmloutput/PrettyWriterTest.java | 2 +- .../rdfxml/xmloutput/TestLiteralEncoding.java | 6 +- .../rdfxml/xmloutput/TestXMLFeatures.java | 4 +- .../test/LoggingClosableIterator.java | 2 +- .../propertytable/graph/GraphCSVTest.java | 4 +- .../main/java/org/apache/jena/iri/IRI.java | 2 +- .../java/org/apache/jena/iri/IRIFactory.java | 4 +- .../org/apache/jena/iri/impl/IRIImpl.java | 4 +- .../org/apache/jena/iri/impl/LexerPath.java | 2 +- .../org/apache/jena/iri/impl/LexerPort.java | 2 +- .../org/apache/jena/iri/impl/LexerQuery.java | 2 +- .../org/apache/jena/iri/impl/LexerScheme.java | 2 +- .../apache/jena/iri/impl/LexerUserinfo.java | 2 +- .../org/apache/jena/iri/impl/LexerXHost.java | 2 +- .../org/apache/jena/iri/TestIRIFactory.java | 2 +- .../SecurityEvaluatorAssembler.java | 2 +- .../permissions/SecuredAssemblerTest.java | 8 +- .../contract/model/SecTestPackage.java | 6 +- .../graph/GraphEventManagerTest.java | 2 - .../jena/permissions/graph/MemGraphTest.java | 24 ++-- .../jena/permissions/graph/TDBGraphTest.java | 4 +- .../model/SecuredModelDetailTest.java | 4 +- .../permissions/model/SecuredModelTest.java | 71 +++++------ 177 files changed, 498 insertions(+), 763 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java b/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java index a059bdfc65b..7d612b791d5 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/data/DataBag.java @@ -20,7 +20,6 @@ import java.util.Iterator; -import org.apache.jena.atlas.lib.Closeable ; import org.apache.jena.atlas.lib.Sink ; /** @@ -52,7 +51,7 @@ * Inspired by Apache Pig * @see DataBag from Apache Pig */ -public interface DataBag extends Sink, Iterable, Closeable +public interface DataBag extends Sink, Iterable { /** * Get the number of elements in the bag, both in memory and on disk. diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java index 05604e545dd..023004cf252 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/JsonArray.java @@ -24,7 +24,7 @@ import java.util.List ; import java.util.ListIterator ; -public class JsonArray extends JsonValue implements List, Iterable +public class JsonArray extends JsonValue implements List { private List array = new ArrayList<>() ; diff --git a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java index 4ce1365b06b..e532f19a285 100644 --- a/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java +++ b/jena-arq/src/main/java/org/apache/jena/atlas/json/io/parser/TokenizerJSON.java @@ -20,10 +20,8 @@ import static org.apache.jena.atlas.lib.Chars.* ; -import java.io.IOException ; import java.util.NoSuchElementException ; -import org.apache.jena.atlas.io.IO ; import org.apache.jena.atlas.io.PeekReader ; import org.apache.jena.atlas.json.JsonParseException ; import org.apache.jena.riot.tokens.Token ; @@ -634,8 +632,7 @@ public long getLine() @Override public void close() { - try { reader.close() ; } - catch (IOException ex) { IO.exception(ex) ; } + reader.close() ; } private boolean isA2Z(int ch) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamQuads.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamQuads.java index 646172e2c69..6ad960a4c29 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamQuads.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamQuads.java @@ -22,7 +22,6 @@ import java.util.Collection; import java.util.List; -import org.apache.jena.riot.system.StreamRDF; import org.apache.jena.sparql.core.Quad ; /** @@ -30,7 +29,7 @@ * * @see CollectorStreamBase */ -public class CollectorStreamQuads extends CollectorStreamBase implements StreamRDF { +public class CollectorStreamQuads extends CollectorStreamBase { private List quads = new ArrayList<>(); @Override diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamTriples.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamTriples.java index 2805eb62d0c..8f2216ce811 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamTriples.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/CollectorStreamTriples.java @@ -23,14 +23,13 @@ import java.util.List; import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.system.StreamRDF; /** * Collector stream for triples. * * @see CollectorStreamBase */ -public class CollectorStreamTriples extends CollectorStreamBase implements StreamRDF { +public class CollectorStreamTriples extends CollectorStreamBase { private List triples = new ArrayList<>(); @Override diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java index 5f9d6a662b1..a08a19af927 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedQuadsStream.java @@ -19,13 +19,12 @@ package org.apache.jena.riot.lang ; import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.sparql.core.Quad ; /** * Implementation of a producer class that sends Quads; must be connected to a {@code PipedRDFIterator}. */ -public class PipedQuadsStream extends PipedRDFStream implements StreamRDF +public class PipedQuadsStream extends PipedRDFStream { /** * Creates a piped quads stream connected to the specified piped diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java index c5c2dfec7b4..db15a86d33b 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTriplesStream.java @@ -19,13 +19,12 @@ package org.apache.jena.riot.lang ; import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.sparql.core.Quad ; /** * Implementation of a producer class that sends Triples; must be connected to a {@code PipedRDFIterator}. */ -public class PipedTriplesStream extends PipedRDFStream implements StreamRDF +public class PipedTriplesStream extends PipedRDFStream { /** * Creates a piped triples stream connected to the specified piped diff --git a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java index 599d9ec7039..74e3b17e08f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/lang/PipedTuplesStream.java @@ -21,13 +21,12 @@ import org.apache.jena.atlas.lib.Tuple ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; -import org.apache.jena.riot.system.StreamRDF ; import org.apache.jena.sparql.core.Quad ; /** * Implementation of a producer class that sends @{code Tuple}; must be connected to a {@code PipedRDFIterator}. */ -public class PipedTuplesStream extends PipedRDFStream> implements StreamRDF +public class PipedTuplesStream extends PipedRDFStream> { /** * Creates a piped tuples stream connected to the specified piped diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java b/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java index d0f16aa039d..2be1b59bd36 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java @@ -28,7 +28,6 @@ import org.apache.jena.sparql.core.DatasetGraph ; import org.apache.jena.sparql.core.Quad ; -import com.github.jsonldjava.core.JsonLdError ; import com.github.jsonldjava.core.RDFDataset ; /** Convert from JSON-LD syntax to JSON-LD internal representation of a dataset, using Jena Quads/Nodes etc */ @@ -36,7 +35,7 @@ class JenaRDF2JSONLD implements com.github.jsonldjava.core.RDFParser { NodeToLabel labels = SyntaxLabels.createNodeToLabel() ; @Override - public RDFDataset parse(Object object) throws JsonLdError { + public RDFDataset parse(Object object) { RDFDataset result = new RDFDataset() ; if ( object instanceof DatasetGraph ) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java b/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java index 0841c50fec6..4a2579fa678 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/out/SinkQuadBracedOutput.java @@ -22,7 +22,6 @@ import java.util.Objects; import org.apache.jena.atlas.io.IndentedWriter ; -import org.apache.jena.atlas.lib.Closeable ; import org.apache.jena.atlas.lib.Sink ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; @@ -33,7 +32,7 @@ /** * A class that print quads, SPARQL style (maybe good for Trig too?) */ -public class SinkQuadBracedOutput implements Sink, Closeable +public class SinkQuadBracedOutput implements Sink { protected static final int BLOCK_INDENT = 2 ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java index a4a14339d81..fece2947b78 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IRIResolver.java @@ -343,7 +343,7 @@ public IRI resolveSilent(final String uriStr) { return iriFactory.create(uriStr) ; Callable filler = new Callable() { @Override - public IRI call() throws Exception { + public IRI call() { return iriFactory.create(uriStr) ; } } ; @@ -434,7 +434,7 @@ public IRI resolveSilent(final String relURI) { return iriFactory.create(relURI) ; Callable filler = new Callable() { @Override - public IRI call() throws Exception { + public IRI call() { return base.create(relURI) ; } } ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java b/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java index 6a0ae98a5e2..eac4befa6a3 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/IteratorStreamRDFText.java @@ -41,7 +41,7 @@ /** Testing/development convenience. * Iterator of StreamRowRDF (always a tuple) for an input stream of tokenized RDT terms. */ -public class IteratorStreamRDFText extends IteratorStreamRDF implements Iterator { +public class IteratorStreamRDFText extends IteratorStreamRDF { private final TokenInputStream in ; private Node[] previousTuple = null ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java index 6a1a865f4fd..07d5eebe83f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/system/StreamRDFCountingBase.java @@ -23,7 +23,7 @@ import org.apache.jena.sparql.core.Quad ; /** Wrap another StreamRDF and provide counts of items */ -public class StreamRDFCountingBase extends StreamRDFWrapper implements StreamRDF, StreamRDFCounting { +public class StreamRDFCountingBase extends StreamRDFWrapper implements StreamRDFCounting { private long countTriples = 0 ; private long countQuads = 0 ; private long countBase = 0 ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java index e297a998675..db2ecffc9d6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/IteratorThriftRDF.java @@ -18,8 +18,6 @@ package org.apache.jena.riot.thrift; -import java.util.Iterator ; - import org.apache.jena.riot.system.* ; import org.apache.jena.riot.thrift.wire.RDF_StreamRow ; import org.apache.thrift.TException ; @@ -29,7 +27,7 @@ /** * Iterator over a Thrift-encoded RDF stream. */ -public class IteratorThriftRDF extends IteratorStreamRDF implements Iterator { +public class IteratorThriftRDF extends IteratorStreamRDF { private final PrefixMap pmap = PrefixMapFactory.create() ; private final StreamRDFCollectOne collector = new StreamRDFCollectOne(pmap) ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java index cfcb8748ebc..3ea1f127cce 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/Thift2Binding.java @@ -20,7 +20,6 @@ import java.io.InputStream ; import java.util.ArrayList ; -import java.util.Iterator ; import java.util.List ; import org.apache.jena.atlas.iterator.IteratorSlotted ; @@ -39,7 +38,7 @@ import org.apache.thrift.transport.TTransportException ; /** Converted from SPARQL result set encoded in Thrift to Bindings */ -public class Thift2Binding extends IteratorSlotted implements Iterator { +public class Thift2Binding extends IteratorSlotted { private List vars = new ArrayList<>() ; private List varNames = new ArrayList<>() ; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java index 5e65a807cf8..b1303461da6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_ANY implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_ANY implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_ANY"); @@ -170,7 +158,7 @@ public int compareTo(RDF_ANY other) { } int lastComparison = 0; - RDF_ANY typedOther = (RDF_ANY)other; + RDF_ANY typedOther = other; return 0; } @@ -196,7 +184,7 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() { // check for required fields // check for sub-struct validity } @@ -209,7 +197,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -265,12 +253,12 @@ public RDF_ANYTupleScheme getScheme() { private static class RDF_ANYTupleScheme extends TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) { TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) { TTupleProtocol iprot = (TTupleProtocol) prot; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java index ed94718f89c..c4a6692b046 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_BNode implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_BNode implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_BNode"); private static final org.apache.thrift.protocol.TField LABEL_FIELD_DESC = new org.apache.thrift.protocol.TField("label", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -235,7 +223,7 @@ public int compareTo(RDF_BNode other) { } int lastComparison = 0; - RDF_BNode typedOther = (RDF_BNode)other; + RDF_BNode typedOther = other; lastComparison = Boolean.valueOf(isSetLabel()).compareTo(typedOther.isSetLabel()); if (lastComparison != 0) { @@ -294,7 +282,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java index 536d6607108..b9a4ff08362 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java @@ -12,26 +12,17 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_DataTuple implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_DataTuple implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_DataTuple"); private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -255,7 +246,7 @@ public int compareTo(RDF_DataTuple other) { } int lastComparison = 0; - RDF_DataTuple typedOther = (RDF_DataTuple)other; + RDF_DataTuple typedOther = other; lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); if (lastComparison != 0) { @@ -298,7 +289,7 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() { // check for required fields // check for sub-struct validity } @@ -311,7 +302,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java index e231c5c6722..27a3719e54f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java @@ -12,26 +12,15 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Decimal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_Decimal implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Decimal"); private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.I64, (short)1); @@ -296,7 +285,7 @@ public int compareTo(RDF_Decimal other) { } int lastComparison = 0; - RDF_Decimal typedOther = (RDF_Decimal)other; + RDF_Decimal typedOther = other; lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); if (lastComparison != 0) { @@ -349,7 +338,7 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() { // check for required fields // alas, we cannot check 'value' because it's a primitive and you chose the non-beans generator. // alas, we cannot check 'scale' because it's a primitive and you chose the non-beans generator. @@ -364,7 +353,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java index 57e4b345484..85ee02de0b7 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_IRI implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_IRI implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_IRI"); private static final org.apache.thrift.protocol.TField IRI_FIELD_DESC = new org.apache.thrift.protocol.TField("iri", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -235,7 +223,7 @@ public int compareTo(RDF_IRI other) { } int lastComparison = 0; - RDF_IRI typedOther = (RDF_IRI)other; + RDF_IRI typedOther = other; lastComparison = Boolean.valueOf(isSetIri()).compareTo(typedOther.isSetIri()); if (lastComparison != 0) { @@ -294,7 +282,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java index b104598d573..a9f443fc687 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java @@ -12,26 +12,15 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Literal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_Literal implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Literal"); private static final org.apache.thrift.protocol.TField LEX_FIELD_DESC = new org.apache.thrift.protocol.TField("lex", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -407,7 +396,7 @@ public int compareTo(RDF_Literal other) { } int lastComparison = 0; - RDF_Literal typedOther = (RDF_Literal)other; + RDF_Literal typedOther = other; lastComparison = Boolean.valueOf(isSetLex()).compareTo(typedOther.isSetLex()); if (lastComparison != 0) { @@ -529,7 +518,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java index 0d77b48cb3b..aa59a0692b4 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_PrefixDecl implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_PrefixDecl implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_PrefixDecl"); private static final org.apache.thrift.protocol.TField PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("prefix", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -294,7 +282,7 @@ public int compareTo(RDF_PrefixDecl other) { } int lastComparison = 0; - RDF_PrefixDecl typedOther = (RDF_PrefixDecl)other; + RDF_PrefixDecl typedOther = other; lastComparison = Boolean.valueOf(isSetPrefix()).compareTo(typedOther.isSetPrefix()); if (lastComparison != 0) { @@ -374,7 +362,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java index 2df8ee12f11..7aacef3fe04 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_PrefixName implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_PrefixName implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_PrefixName"); private static final org.apache.thrift.protocol.TField PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("prefix", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -294,7 +282,7 @@ public int compareTo(RDF_PrefixName other) { } int lastComparison = 0; - RDF_PrefixName typedOther = (RDF_PrefixName)other; + RDF_PrefixName typedOther = other; lastComparison = Boolean.valueOf(isSetPrefix()).compareTo(typedOther.isSetPrefix()); if (lastComparison != 0) { @@ -374,7 +362,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java index c9abce6ab88..13047c320cf 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java @@ -12,26 +12,15 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Quad implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_Quad implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Quad"); private static final org.apache.thrift.protocol.TField S_FIELD_DESC = new org.apache.thrift.protocol.TField("S", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -411,7 +400,7 @@ public int compareTo(RDF_Quad other) { } int lastComparison = 0; - RDF_Quad typedOther = (RDF_Quad)other; + RDF_Quad typedOther = other; lastComparison = Boolean.valueOf(isSetS()).compareTo(typedOther.isSetS()); if (lastComparison != 0) { @@ -532,7 +521,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java index f0757059ec6..48f9b9dfb45 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_REPEAT implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_REPEAT implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_REPEAT"); @@ -170,7 +158,7 @@ public int compareTo(RDF_REPEAT other) { } int lastComparison = 0; - RDF_REPEAT typedOther = (RDF_REPEAT)other; + RDF_REPEAT typedOther = other; return 0; } @@ -196,7 +184,7 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() { // check for required fields // check for sub-struct validity } @@ -209,7 +197,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -265,12 +253,12 @@ public RDF_REPEATTupleScheme getScheme() { private static class RDF_REPEATTupleScheme extends TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) { TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) { TTupleProtocol iprot = (TTupleProtocol) prot; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java index 2453b0426ae..d7bc8d3098e 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java @@ -6,29 +6,12 @@ */ package org.apache.jena.riot.thrift.wire; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class RDF_StreamRow extends org.apache.thrift.TUnion { @@ -407,7 +390,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java index 6fd9bad7648..eae32a89634 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java @@ -6,29 +6,12 @@ */ package org.apache.jena.riot.thrift.wire; -import org.apache.thrift.scheme.IScheme; -import org.apache.thrift.scheme.SchemeFactory; -import org.apache.thrift.scheme.StandardScheme; - -import org.apache.thrift.scheme.TupleScheme; -import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class RDF_Term extends org.apache.thrift.TUnion { @@ -889,7 +872,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java index 7a58bfa30cc..ef3e34aa05b 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Triple implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_Triple implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Triple"); private static final org.apache.thrift.protocol.TField S_FIELD_DESC = new org.apache.thrift.protocol.TField("S", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -353,34 +341,33 @@ public int compareTo(RDF_Triple other) { } int lastComparison = 0; - RDF_Triple typedOther = (RDF_Triple)other; - lastComparison = Boolean.valueOf(isSetS()).compareTo(typedOther.isSetS()); + lastComparison = Boolean.valueOf(isSetS()).compareTo(other.isSetS()); if (lastComparison != 0) { return lastComparison; } if (isSetS()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.S, typedOther.S); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.S, other.S); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetP()).compareTo(typedOther.isSetP()); + lastComparison = Boolean.valueOf(isSetP()).compareTo(other.isSetP()); if (lastComparison != 0) { return lastComparison; } if (isSetP()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.P, typedOther.P); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.P, other.P); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetO()).compareTo(typedOther.isSetO()); + lastComparison = Boolean.valueOf(isSetO()).compareTo(other.isSetO()); if (lastComparison != 0) { return lastComparison; } if (isSetO()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.O, typedOther.O); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.O, other.O); if (lastComparison != 0) { return lastComparison; } @@ -454,7 +441,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java index 934ade4ca76..7f06678e07f 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_UNDEF implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_UNDEF implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_UNDEF"); @@ -170,7 +158,6 @@ public int compareTo(RDF_UNDEF other) { } int lastComparison = 0; - RDF_UNDEF typedOther = (RDF_UNDEF)other; return 0; } @@ -196,7 +183,7 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() { // check for required fields // check for sub-struct validity } @@ -209,7 +196,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -265,12 +252,12 @@ public RDF_UNDEFTupleScheme getScheme() { private static class RDF_UNDEFTupleScheme extends TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) throws org.apache.thrift.TException { + public void write(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) { TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) throws org.apache.thrift.TException { + public void read(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) { TTupleProtocol iprot = (TTupleProtocol) prot; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java index 280f9d542da..61d56f04aa2 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java @@ -12,26 +12,14 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_VAR implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_VAR implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_VAR"); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -235,14 +223,13 @@ public int compareTo(RDF_VAR other) { } int lastComparison = 0; - RDF_VAR typedOther = (RDF_VAR)other; - lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName()); + lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); if (lastComparison != 0) { return lastComparison; } if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); if (lastComparison != 0) { return lastComparison; } @@ -294,7 +281,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java index 0700e006559..ba7b8f6712e 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java @@ -12,26 +12,17 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_VarTuple implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { +public class RDF_VarTuple implements org.apache.thrift.TBase, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_VarTuple"); private static final org.apache.thrift.protocol.TField VARS_FIELD_DESC = new org.apache.thrift.protocol.TField("vars", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -255,14 +246,13 @@ public int compareTo(RDF_VarTuple other) { } int lastComparison = 0; - RDF_VarTuple typedOther = (RDF_VarTuple)other; - lastComparison = Boolean.valueOf(isSetVars()).compareTo(typedOther.isSetVars()); + lastComparison = Boolean.valueOf(isSetVars()).compareTo(other.isSetVars()); if (lastComparison != 0) { return lastComparison; } if (isSetVars()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vars, typedOther.vars); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vars, other.vars); if (lastComparison != 0) { return lastComparison; } @@ -298,7 +288,7 @@ public String toString() { return sb.toString(); } - public void validate() throws org.apache.thrift.TException { + public void validate() { // check for required fields // check for sub-struct validity } @@ -311,7 +301,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Op.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Op.java index 6603c4ea940..fe727f21c35 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Op.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/Op.java @@ -18,12 +18,11 @@ package org.apache.jena.sparql.algebra; -import org.apache.jena.atlas.io.Printable ; import org.apache.jena.sparql.util.Named ; import org.apache.jena.sparql.util.NodeIsomorphismMap ; import org.apache.jena.sparql.util.PrintSerializable ; -public interface Op extends PrintSerializable, Printable, Named +public interface Op extends PrintSerializable, Named { public void visit(OpVisitor opVisitor) ; public boolean equalTo(Op other, NodeIsomorphismMap labelMap) ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java index e30b7e9b778..51eca5837b8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetAssembler.java @@ -35,7 +35,7 @@ import org.apache.jena.sparql.util.FmtUtils ; import org.apache.jena.sparql.util.graph.GraphUtils ; -public class DatasetAssembler extends AssemblerBase implements Assembler { +public class DatasetAssembler extends AssemblerBase { public static Resource getType() { return DatasetAssemblerVocab.tDataset ; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetDescriptionAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetDescriptionAssembler.java index 865013a2474..b949037ef06 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetDescriptionAssembler.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetDescriptionAssembler.java @@ -27,7 +27,7 @@ import org.apache.jena.sparql.core.DatasetDescription ; import org.apache.jena.sparql.util.graph.GraphUtils ; -public class DatasetDescriptionAssembler extends AssemblerBase implements Assembler +public class DatasetDescriptionAssembler extends AssemblerBase { public DatasetDescriptionAssembler() {} diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java index 116f5c504cb..38bdca01133 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/core/assembler/DatasetNullAssembler.java @@ -30,7 +30,7 @@ import org.apache.jena.sparql.modify.GraphStoreNull ; import org.apache.jena.sparql.modify.GraphStoreNullTransactional ; -public class DatasetNullAssembler extends AssemblerBase implements Assembler +public class DatasetNullAssembler extends AssemblerBase { public static Resource getType() { return DatasetAssemblerVocab.tDatasetNull ; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java index f500526c5af..675f5769e0b 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterSort.java @@ -27,7 +27,6 @@ import org.apache.jena.atlas.data.ThresholdPolicy ; import org.apache.jena.atlas.data.ThresholdPolicyFactory ; import org.apache.jena.atlas.iterator.IteratorDelayedInitialization ; -import org.apache.jena.atlas.lib.Closeable ; import org.apache.jena.query.QueryCancelledException ; import org.apache.jena.query.SortCondition ; import org.apache.jena.riot.system.SerializationFactoryFinder ; @@ -71,7 +70,7 @@ public void requestCancel() super.requestCancel() ; } - private class SortedBindingIterator extends IteratorDelayedInitialization implements Closeable + private class SortedBindingIterator extends IteratorDelayedInitialization { private final QueryIterator qIter; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/function/CastXSD_DateTime.java b/jena-arq/src/main/java/org/apache/jena/sparql/function/CastXSD_DateTime.java index eab9b96b511..a72c80913a8 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/function/CastXSD_DateTime.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/function/CastXSD_DateTime.java @@ -25,7 +25,7 @@ /** Cast DateTime */ -public class CastXSD_DateTime extends CastXSD implements FunctionFactory +public class CastXSD_DateTime extends CastXSD { public CastXSD_DateTime(XSDDatatype dt) { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java index 0fd1859cd08..f1eaeb112dc 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQL.java @@ -44,7 +44,7 @@ * It enables the full Jena API to be used with data only accessible * via a Dataset. */ -public class GraphSPARQL extends GraphBase implements Graph +public class GraphSPARQL extends GraphBase { private static Logger log = LoggerFactory.getLogger(GraphSPARQL.class) ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQLService.java b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQLService.java index 081b19a193c..20679346d91 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQLService.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/graph/GraphSPARQLService.java @@ -18,7 +18,6 @@ package org.apache.jena.sparql.graph; -import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Node ; import org.apache.jena.graph.Triple ; import org.apache.jena.graph.impl.GraphBase ; @@ -33,7 +32,7 @@ /** This class provides the Jena Graph interface to a remote SPARQL endpoint. * Efficiency not guaranteed. */ -public class GraphSPARQLService extends GraphBase implements Graph +public class GraphSPARQLService extends GraphBase { private static Logger log = LoggerFactory.getLogger(GraphSPARQLService.class) ; diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java index 876a68b4488..9132d852502 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/arq/ARQParser.java @@ -11,7 +11,7 @@ import org.apache.jena.sparql.modify.request.* ; @SuppressWarnings("all") -public class ARQParser extends ARQParserBase implements ARQParserConstants { +public class ARQParser extends ARQParserBase { boolean allowAggregatesInExpressions = false ; final public void QueryUnit() throws ParseException { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java index d3049f7803f..ad1a7101420 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java @@ -33,7 +33,7 @@ //This is javacc generated code @SuppressWarnings("all") -public class SPARQLParser10 extends SPARQLParser10Base implements SPARQLParser10Constants { +public class SPARQLParser10 extends SPARQLParser10Base { boolean allowAggregatesInExpressions = false ; final public void QueryUnit() throws ParseException { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java index a6d961fde9d..a99a98aefa3 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java @@ -11,7 +11,7 @@ import org.apache.jena.sparql.modify.request.* ; @SuppressWarnings("all") -public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11Constants { +public class SPARQLParser11 extends SPARQLParser11Base { boolean allowAggregatesInExpressions = false ; final public void QueryUnit() throws ParseException { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/mgt/ContextMBean.java b/jena-arq/src/main/java/org/apache/jena/sparql/mgt/ContextMBean.java index 9327daf5ad6..47b78a47a2f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/mgt/ContextMBean.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/mgt/ContextMBean.java @@ -36,7 +36,7 @@ public ContextMBean(Context context) private Object getAsString(String name) { return context.getAsString(Symbol.create(name)) ; } @Override - public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException + public Object getAttribute(String attribute) { return getAsString(attribute) ; } @@ -95,15 +95,13 @@ public MBeanInfo getMBeanInfo() } @Override - public Object invoke(String actionName, Object[] params, String[] signature) throws MBeanException, - ReflectionException + public Object invoke(String actionName, Object[] params, String[] signature) { return null ; } @Override - public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, - MBeanException, ReflectionException + public void setAttribute(Attribute attribute) { context.set(Symbol.create(attribute.getName()), attribute.getValue()) ; } diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java index bd0b29fae27..e05f24513e3 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemote.java @@ -23,13 +23,12 @@ import org.apache.jena.riot.web.HttpOp ; import org.apache.jena.sparql.ARQException ; import org.apache.jena.sparql.util.Context ; -import org.apache.jena.update.UpdateProcessor ; import org.apache.jena.update.UpdateRequest ; /** * UpdateProcess that send the request to a SPARQL endpoint by using POST of application/sparql-update. */ -public class UpdateProcessRemote extends UpdateProcessRemoteBase implements UpdateProcessor +public class UpdateProcessRemote extends UpdateProcessRemoteBase { /** * Creates a new remote update processor that uses the application/sparql-update submission method diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java index ac1f52bbbf6..77fd27f6ccb 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/modify/UpdateProcessRemoteForm.java @@ -25,7 +25,6 @@ import org.apache.jena.sparql.engine.http.HttpParams ; import org.apache.jena.sparql.engine.http.Params ; import org.apache.jena.sparql.util.Context ; -import org.apache.jena.update.UpdateProcessor ; import org.apache.jena.update.UpdateRequest ; /** @@ -33,7 +32,7 @@ * form and POST Use of application/sparql-update via @link{UpdateProcessRemote} * is preferred. */ -public class UpdateProcessRemoteForm extends UpdateProcessRemoteBase implements UpdateProcessor { +public class UpdateProcessRemoteForm extends UpdateProcessRemoteBase { /** * Creates a new remote update processor that uses the form URL encoded diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputSAX.java b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputSAX.java index cb3d160decc..150280cf5ea 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputSAX.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/resultset/XMLInputSAX.java @@ -129,22 +129,22 @@ static class ResultSetXMLHandler2 implements ContentHandler { public void setDocumentLocator(Locator locator) {} @Override - public void startDocument() throws SAXException {} + public void startDocument() {} @Override - public void endDocument() throws SAXException {} + public void endDocument() {} @Override - public void startPrefixMapping(String prefix, String uri) throws SAXException { + public void startPrefixMapping(String prefix, String uri) { if ( uri.equals(RDF.getURI()) ) rdfPrefix = prefix ; } @Override - public void endPrefixMapping(String prefix) throws SAXException {} + public void endPrefixMapping(String prefix) {} @Override - public void startElement(String ns, String localName, String qName, Attributes attrs) throws SAXException { + public void startElement(String ns, String localName, String qName, Attributes attrs) { if ( !ns.equals(namespace) ) { // Wrong namespace return ; @@ -208,7 +208,7 @@ public void startElement(String ns, String localName, String qName, Attributes a } @Override - public void endElement(String ns, String localName, String qName) throws SAXException { + public void endElement(String ns, String localName, String qName) { if ( !ns.equals(namespace) ) { // Wrong namespace return ; @@ -357,7 +357,7 @@ private void endAccumulate() { } @Override - public void characters(char[] chars, int start, int finish) throws SAXException { + public void characters(char[] chars, int start, int finish) { if ( accumulate ) { if ( buff == null ) buff = new StringBuffer() ; @@ -366,12 +366,12 @@ public void characters(char[] chars, int start, int finish) throws SAXException } @Override - public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {} + public void ignorableWhitespace(char[] ch, int start, int length) {} @Override - public void processingInstruction(String target, String data) throws SAXException {} + public void processingInstruction(String target, String data) {} @Override - public void skippedEntity(String name) throws SAXException {} + public void skippedEntity(String name) {} } } diff --git a/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java b/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java index b2781b9d891..568d8321a4c 100644 --- a/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java +++ b/jena-arq/src/main/java/org/apache/jena/web/DatasetGraphAccessorHTTP.java @@ -18,7 +18,6 @@ package org.apache.jena.web ; -import java.io.IOException ; import java.io.OutputStream ; import org.apache.http.HttpEntity ; @@ -239,7 +238,7 @@ protected HttpEntity graphToHttpEntity(final Graph graph) { final RDFFormat syntax = getOutboundSyntax() ; ContentProducer producer = new ContentProducer() { @Override - public void writeTo(OutputStream out) throws IOException { + public void writeTo(OutputStream out) { RDFDataMgr.write(out, graph, syntax) ; } } ; diff --git a/jena-arq/src/main/java/riotcmd/utf8.java b/jena-arq/src/main/java/riotcmd/utf8.java index 2b6698516ca..52044f6ab17 100644 --- a/jena-arq/src/main/java/riotcmd/utf8.java +++ b/jena-arq/src/main/java/riotcmd/utf8.java @@ -18,7 +18,6 @@ package riotcmd; -import java.io.IOException ; import java.io.InputStream ; import org.apache.jena.atlas.AtlasException ; @@ -73,10 +72,6 @@ public static void main(String[] args) { System.out.printf(label+"[line=%d, col=%d] %s\n", lineNum, colNum, ex.getMessage()) ; } - catch (IOException ex) - { - ex.printStackTrace(System.err) ; - } finally { IO.close(utf8) ; } } } diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java index aaff63ddb06..9a37f8ba537 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestPipedRDFIterators.java @@ -93,7 +93,7 @@ public void run() { Callable consumeTriples = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { int count = 0; while (it.hasNext()) { it.next(); @@ -238,7 +238,7 @@ public void run() { Callable consumeQuads = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { int count = 0; while (it.hasNext()) { it.next(); @@ -408,7 +408,7 @@ public void run() { Callable consumeTriples = new Callable() { @Override - public Integer call() throws Exception { + public Integer call() { int count = 0; while (it.hasNext()) { it.next(); diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java index 4bb3a4b39d6..d3424b9f17f 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaReaders.java @@ -54,7 +54,7 @@ public Properties getLangToClassName() { } @Test - public void wireIntoJena() throws Exception { + public void wireIntoJena() { IO_JenaReaders.wireIntoJena(); RDFReaderFImpl readerF = new RDFReaderFImpl(); assertEquals(RDFReaderRIOT_Web.class, readerF.getReader().getClass()); @@ -74,7 +74,7 @@ public void wireIntoJena() throws Exception { } @Test - public void resetJena() throws Exception { + public void resetJena() { IO_JenaReaders.wireIntoJena(); IO_JenaReaders.resetJena(); RDFReaderFImplExposingProtected readerF = new RDFReaderFImplExposingProtected(); diff --git a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java index af643ef329e..b7c71a3b371 100644 --- a/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java +++ b/jena-arq/src/test/java/org/apache/jena/riot/system/TestIO_JenaWriters.java @@ -62,7 +62,7 @@ public Properties getLangToClassName() { } @Test - public void testWireIntoJena() throws Exception { + public void testWireIntoJena() { IO_JenaWriters.wireIntoJena(); RDFWriterFImpl writerF = new RDFWriterFImpl(); assertEquals(Basic.class, writerF.getWriter().getClass()); @@ -88,7 +88,7 @@ public void testWireIntoJena() throws Exception { } @Test - public void testResetJena() throws Exception { + public void testResetJena() { IO_JenaWriters.wireIntoJena(); IO_JenaWriters.resetJena(); RDFWriterFImplExposingProtected writerF = new RDFWriterFImplExposingProtected(); diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java index 7cb3a6dcf27..e2f678fd99e 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/core/TestDatasetGraphWithLock.java @@ -53,7 +53,7 @@ public synchronized void dsg_with_lock_concurrency_01() throws InterruptedExcept Callable callable = new Callable() { @Override - public Boolean call() throws Exception { + public Boolean call() { dsg.begin(ReadWrite.READ); // Hold the lock for a few seconds @@ -89,7 +89,7 @@ public synchronized void dsg_with_lock_concurrency_02() throws InterruptedExcept Callable callable = new Callable() { @Override - public Boolean call() throws Exception { + public Boolean call() { dsg.begin(ReadWrite.READ); // Hold the lock for a few seconds diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java index aecdae3bea2..50c1409b0e4 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/index/TestIndexTable.java @@ -142,7 +142,7 @@ public void testHashIndexTableData() throws Exception } @Test - public void testLinearIndexTableData() throws Exception + public void testLinearIndexTableData() { // test twice with different internal mappings testTableData(IndexFactory.createIndex(order1, partData())) ; @@ -160,7 +160,7 @@ public void testLinearIndexTableData() throws Exception testTableData(new LinearIndex(order2, partData(), emptyKeys, emptyMapping)) ; } - private void testTableData(IndexTable index) throws Exception + private void testTableData(IndexTable index) { // positive test for matching for ( Binding b: fData ) diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java index 9e0195929f8..27d0519f80f 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/EarlTestCase.java @@ -100,18 +100,18 @@ final protected void runTest() throws Throwable // Increase visibility. @Override - protected void setUp() throws Exception { + protected void setUp() { setUpTest() ; } @Override - protected void tearDown() throws Exception { + protected void tearDown() { tearDownTest() ; } // Decouple from JUnit3. - public void setUpTest() throws Exception {} - public void tearDownTest() throws Exception {} + public void setUpTest() {} + public void tearDownTest() {} protected void success() { diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java index d92d19a5df6..89844e14470 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/QueryTest.java @@ -68,7 +68,7 @@ public QueryTest(String testName, EarlReport earl, TestItem t) private boolean oldPlainGraphFlag ; @Override - public void setUpTest() throws Exception + public void setUpTest() { super.setUpTest() ; // SPARQL and ARQ tests are done with no value matching (for query execution and results testing) @@ -83,7 +83,7 @@ public void setUpTest() throws Exception } @Override - public void tearDownTest() throws Exception + public void tearDownTest() { SystemARQ.UsePlainGraph = oldPlainGraphFlag ; CheckerLiterals.WarnOnBadLiterals = oldWarningFlag ; @@ -185,7 +185,7 @@ else if ( query.isAskType() ) } } - void runTestSelect(Query query, QueryExecution qe) throws Exception + void runTestSelect(Query query, QueryExecution qe) { // Do the query! ResultSetRewindable resultsActual = ResultSetFactory.makeRewindable(qe.execSelect()) ; @@ -345,7 +345,7 @@ private boolean checkResultsByModel(Query query, Model expectedModel, ResultSetR return b ; } - void runTestConstruct(Query query, QueryExecution qe) throws Exception + void runTestConstruct(Query query, QueryExecution qe) { // Do the query! Model resultsActual = qe.execConstruct() ; @@ -374,7 +374,7 @@ private void compareGraphResults(Model resultsActual, Query query) } } - void runTestDescribe(Query query, QueryExecution qe) throws Exception + void runTestDescribe(Query query, QueryExecution qe) { Model resultsActual = qe.execDescribe() ; compareGraphResults(resultsActual, query) ; diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java index 3280ea03583..4a4d0a81c60 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SurpressedTest.java @@ -31,7 +31,7 @@ public SurpressedTest(String testName, EarlReport report, TestItem testItem) } @Override - protected void runTestForReal() throws Throwable + protected void runTestForReal() { super.notTested() ; if ( verbose ) diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java index 94ed6ffd4ce..84a2e4a5ad9 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxTest.java @@ -57,7 +57,7 @@ private void setTest(String testName, String _queryString, boolean positiveTest) @Override - protected void runTestForReal() throws Throwable + protected void runTestForReal() { try { if ( queryString == null ) diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java index 5e84475d5c7..eec627da213 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/SyntaxUpdateTest.java @@ -55,7 +55,7 @@ private void setTest(String testName, String _queryString, boolean positiveTest) @Override - protected void runTestForReal() throws Throwable + protected void runTestForReal() { try { if ( updateString == null ) diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java index 08fcd5ddaa3..df37aac604d 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/TestSerialization.java @@ -61,7 +61,7 @@ private void setTest(String testName, EarlReport earl, String _queryString) // Are they equal? @Override - protected void runTestForReal() throws Throwable + protected void runTestForReal() { Query query = null ; if ( queryString == null ) diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java b/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java index da84ff80354..20dffe7aebf 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/junit/UpdateTest.java @@ -81,7 +81,7 @@ private UpdateTest(String testName, EarlReport earl, Resource entry, Resource ac private boolean oldWarningFlag ; @Override - public void setUpTest() throws Exception + public void setUpTest() { super.setUpTest() ; // Turn parser warnings off for the test data. @@ -92,7 +92,7 @@ public void setUpTest() throws Exception } @Override - public void tearDownTest() throws Exception + public void tearDownTest() { // if ( resetNeeded ) // ARQ.setFalse(ARQ.strictGraph) ; @@ -103,7 +103,7 @@ public void tearDownTest() throws Exception } @Override - protected void runTestForReal() throws Throwable + protected void runTestForReal() { try { UpdateRequest request = UpdateFactory.read(updateFile, Syntax.syntaxSPARQL_11) ; diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java index 1e5b0333b6a..1ff802eb84b 100644 --- a/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java +++ b/jena-arq/src/test/java/org/apache/jena/sparql/util/TestFmtUtils.java @@ -87,7 +87,7 @@ public void formatPattern_2_triples() { } @Test - public void stringForObject_misc_versions() throws Exception { + public void stringForObject_misc_versions() { assertEquals("<>", FmtUtils.stringForObject(null)) ; assertEquals("", FmtUtils.stringForObject(new LiteralImpl(aNode(), null))) ; assertEquals("", FmtUtils.stringForObject(new ResourceImpl(NodeFactory.createURI("nzz1"), null))) ; @@ -130,7 +130,7 @@ public void booleanLiteral() throws Exception { } @Test - public void stringForRDFNode_resource() throws Exception { + public void stringForRDFNode_resource() { final ResourceImpl rdfNod = new ResourceImpl(aUriRemappableNode(), null) ; assertEquals("zz:abs", stringForRDFNode(rdfNod, getContext())) ; } @@ -160,7 +160,7 @@ public void anyNode() { } @Test - public void testStringForURI() throws Exception { + public void testStringForURI() { final String s = FmtUtils.stringForURI("zz:ü_fe-zz") ; assertEquals("", s) ; diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java b/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java index b17e9305f61..214a48a95d2 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/BufferingWriter.java @@ -154,27 +154,27 @@ public void flush() { } @Override - public void write(char[] cbuf, int off, int len) throws IOException { + public void write(char[] cbuf, int off, int len) { output(cbuf, off, len) ; } @Override - public void write(char[] cbuf) throws IOException { + public void write(char[] cbuf) { write(cbuf, 0, cbuf.length) ; } @Override - public void write(String string, int off, int len) throws IOException { + public void write(String string, int off, int len) { output(string, off, len) ; } @Override - public void write(String string) throws IOException { + public void write(String string) { output(string, 0, string.length()) ; } @Override - public void write(int ch) throws IOException { + public void write(int ch) { output((char)ch) ; } } diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java b/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java index d7dce1160f7..f1d54b11b89 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/CharStreamReader.java @@ -18,14 +18,13 @@ package org.apache.jena.atlas.io; -import java.io.IOException ; import java.io.Reader ; /** Machinary to add Reader functionality to a CharStream */ public abstract class CharStreamReader extends Reader implements CharStream { @Override - public int read(char[] cbuf, int off, int len) throws IOException + public int read(char[] cbuf, int off, int len) { for ( int i = 0 ; i < len ; i++ ) { @@ -38,14 +37,14 @@ public int read(char[] cbuf, int off, int len) throws IOException } @Override - public int read() throws IOException + public int read() { return advance() ; } @Override - public void close() throws IOException + public void close() { closeStream() ; } @Override diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java index 049449cb3f0..c369cc6fb5c 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamASCII.java @@ -58,7 +58,7 @@ public void closeStream() { IO.close(input) ; } @Override - public int read(char[] cbuf, int off, int len) throws IOException + public int read(char[] cbuf, int off, int len) { for ( int i = off ; i < off+len ; i++ ) { @@ -77,7 +77,7 @@ public int read(char[] cbuf, int off, int len) throws IOException } @Override - public int read() throws IOException + public int read() { return advance() ; } @Override diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java index 590388253ca..157829f02ff 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/InStreamUTF8.java @@ -113,7 +113,7 @@ public void closeStream() { IO.close(input) ; } @Override - public int read(char[] cbuf, int off, int len) throws IOException + public int read(char[] cbuf, int off, int len) { // Doing this on a block of bytes may be faster. for ( int i = off ; i < off+len ; i++ ) @@ -131,7 +131,7 @@ public int read(char[] cbuf, int off, int len) throws IOException } @Override - public final int read() throws IOException + public final int read() { int ch = advance(input) ; //if ( ! Character.isDefined(ch) ) throw new AtlasException(String.format("Undefined codepoint: 0x%04X", ch)) ; diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java index 51414f98ce9..f4f68c43df2 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/IndentedWriter.java @@ -24,13 +24,12 @@ import java.io.Writer ; import org.apache.jena.atlas.RuntimeIOException ; -import org.apache.jena.atlas.lib.Closeable ; /** A writer that records what the current indentation level is, and * uses that to insert a prefix at each line. * It can also insert line numbers at the beginning of lines. */ -public class IndentedWriter extends AWriterBase implements AWriter, Closeable +public class IndentedWriter extends AWriterBase { /** Stdout wrapped in an IndentedWriter - no line numbers */ public static final IndentedWriter stdout = new IndentedWriter(System.out) ; diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java b/jena-base/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java index 9b03d434ea3..602807b80cb 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/InputStreamBuffered.java @@ -59,7 +59,7 @@ public InputStreamBuffered(InputStream input, int bufsize) // } @Override - public int read() throws IOException + public int read() { return advance() ; } diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java index 4a6403ce728..a1c7c7a7030 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekInputStream.java @@ -134,7 +134,7 @@ public final void close() throws IOException } @Override - public final int read() throws IOException + public final int read() { if ( eof() ) return EOF ; @@ -143,7 +143,7 @@ public final int read() throws IOException } @Override - public final int read(byte[] buf, int off, int len) throws IOException + public final int read(byte[] buf, int off, int len) { if ( eof() ) return EOF ; @@ -192,10 +192,8 @@ private final void init() private final void advanceAndSet() { - try { - int ch = source.read() ; - setCurrByte(ch) ; - } catch (IOException ex) { IO.exception(ex) ; } + int ch = source.read() ; + setCurrByte(ch) ; } diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java index 31076b0ed06..f132ce4c501 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/PeekReader.java @@ -172,12 +172,12 @@ public final void pushbackChar(int ch) { // Reader operations @Override - public final void close() throws IOException { + public final void close() { source.closeStream() ; } @Override - public final int read() throws IOException { + public final int read() { if ( eof() ) return EOF ; int x = readChar() ; @@ -185,7 +185,7 @@ public final int read() throws IOException { } @Override - public final int read(char[] cbuf, int off, int len) throws IOException { + public final int read(char[] cbuf, int off, int len) { if ( eof() ) return EOF ; // Note - we need to preserve line count diff --git a/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java b/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java index 100ec6fc78d..779ab4d54ca 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/io/Writer2.java @@ -22,11 +22,9 @@ import java.io.IOException ; import java.io.Writer ; -import org.apache.jena.atlas.lib.Closeable ; - /** A Writer, without the checked exceptions. */ -public class Writer2 extends AWriterBase implements AWriter, Closeable +public class Writer2 extends AWriterBase { protected final Writer writer ; diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java index 9cf45a77cfb..912dc463108 100644 --- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java +++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/Iter.java @@ -53,8 +53,8 @@ public static Iterator singleton(T item) { @SuppressWarnings("rawtypes") private static final Iterator iter0 = new NullIterator() ; - @SuppressWarnings({"unchecked", "cast"}) - public static Iterator nullIterator() { return (NullIterator)iter0 ; } + @SuppressWarnings({"unchecked"}) + public static Iterator nullIterator() { return iter0 ; } // public static Iterator nullIterator() { // return new NullIterator() ; diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java index 8aae32b160d..193b0a5355e 100644 --- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java +++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestDateTimeUtils.java @@ -29,7 +29,7 @@ public class TestDateTimeUtils { @Test - public void testCalendarToXSDDateTimeString_1() throws Exception { + public void testCalendarToXSDDateTimeString_1() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 0, "Z") ; assertEquals("1984-03-22T14:32:01+00:00", DateTimeUtils.calendarToXSDDateTimeString(cal)); cal.setTimeZone(TimeZone.getTimeZone("MST")); @@ -37,7 +37,7 @@ public void testCalendarToXSDDateTimeString_1() throws Exception { } @Test - public void testCalendarToXSDDateTimeString_2() throws Exception { + public void testCalendarToXSDDateTimeString_2() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 50, "Z") ; assertEquals("1984-03-22T14:32:01.050+00:00", DateTimeUtils.calendarToXSDDateTimeString(cal)); cal.setTimeZone(TimeZone.getTimeZone("MST")); @@ -46,7 +46,7 @@ public void testCalendarToXSDDateTimeString_2() throws Exception { @Test - public void testCalendarToXSDDateString() throws Exception { + public void testCalendarToXSDDateString() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 23, 59, 1, 0, "Z"); cal.setTimeZone(TimeZone.getTimeZone("Z")) ; assertEquals("1984-03-22+00:00", DateTimeUtils.calendarToXSDDateString(cal)); @@ -55,7 +55,7 @@ public void testCalendarToXSDDateString() throws Exception { } @Test - public void testCalendarToXSDTimeString_1() throws Exception { + public void testCalendarToXSDTimeString_1() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 0, "GMT+01:00"); assertEquals("14:32:01+01:00", DateTimeUtils.calendarToXSDTimeString(cal)); // Different timezone - moves the cal point-in-time. @@ -64,7 +64,7 @@ public void testCalendarToXSDTimeString_1() throws Exception { } @Test - public void testCalendarToXSDTimeString_2() throws Exception { + public void testCalendarToXSDTimeString_2() { Calendar cal = createCalendar(1984, Calendar.MARCH, 22, 14, 32, 1, 500, "GMT+01:00"); assertEquals("14:32:01.500+01:00", DateTimeUtils.calendarToXSDTimeString(cal)); // Different timezone - moves the cal point-in-time. 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 02d21ca6b3f..dae306156fb 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 @@ -25,7 +25,7 @@ import org.apache.jena.rdf.model.* ; import org.apache.jena.vocabulary.RDFS ; -public abstract class AssemblerGroup extends AssemblerBase implements Assembler +public abstract class AssemblerGroup extends AssemblerBase { public abstract AssemblerGroup implementWith( Resource type, Assembler a ); diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java index 76c2ee59d65..e804d9f5bb6 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ContentAssembler.java @@ -28,7 +28,7 @@ import org.apache.jena.util.* ; import org.apache.jena.vocabulary.* ; -public class ContentAssembler extends AssemblerBase implements Assembler +public class ContentAssembler extends AssemblerBase { protected final FileManager defaultFileManager; diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/DefaultModelAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/DefaultModelAssembler.java index dbfdc351458..41f5005ea33 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/DefaultModelAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/DefaultModelAssembler.java @@ -21,7 +21,7 @@ import org.apache.jena.assembler.* ; import org.apache.jena.rdf.model.* ; -public class DefaultModelAssembler extends ModelAssembler implements Assembler +public class DefaultModelAssembler extends ModelAssembler { @Override public Object open( Assembler a, Resource root, Mode mode ) diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/MemoryModelAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/MemoryModelAssembler.java index 2509b2c3d48..7bab9c21a69 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/MemoryModelAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/MemoryModelAssembler.java @@ -26,7 +26,7 @@ import org.apache.jena.rdf.model.ModelFactory ; import org.apache.jena.rdf.model.Resource ; -public class MemoryModelAssembler extends ModelAssembler implements Assembler +public class MemoryModelAssembler extends ModelAssembler { @Override public Object open( Assembler a, Resource root, Mode mode ) 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 35d7491e514..dd14b67691a 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 @@ -27,7 +27,7 @@ import org.apache.jena.shared.* ; import org.apache.jena.vocabulary.RDF ; -public abstract class ModelAssembler extends AssemblerBase implements Assembler +public abstract class ModelAssembler extends AssemblerBase { protected abstract Model openEmptyModel( Assembler a, Resource root, Mode mode ); diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java index 8f408b6d1e0..73823cfa9b5 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelAssembler.java @@ -24,7 +24,7 @@ import org.apache.jena.ontology.* ; import org.apache.jena.rdf.model.* ; -public class OntModelAssembler extends InfModelAssembler implements Assembler +public class OntModelAssembler extends InfModelAssembler { @Override public Model openEmptyModel( Assembler a, Resource root, Mode mode ) { diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java index 1e8a21c6144..27fbab384cb 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/OntModelSpecAssembler.java @@ -35,7 +35,7 @@ unless the root is ja:SPOO for some constant SPOO of OntModelSpec, in which case the defaults are taken from there. */ -public class OntModelSpecAssembler extends AssemblerBase implements Assembler +public class OntModelSpecAssembler extends AssemblerBase { private static final OntModelSpec DEFAULT = OntModelSpec.OWL_MEM_RDFS_INF; diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/PrefixMappingAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/PrefixMappingAssembler.java index 21baa0171f6..b8f58a193e1 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/PrefixMappingAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/PrefixMappingAssembler.java @@ -22,7 +22,7 @@ import org.apache.jena.rdf.model.* ; import org.apache.jena.shared.PrefixMapping ; -public class PrefixMappingAssembler extends AssemblerBase implements Assembler +public class PrefixMappingAssembler extends AssemblerBase { @Override public Object open( Assembler a, Resource root, Mode irrelevant ) diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ReasonerFactoryAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ReasonerFactoryAssembler.java index 77e84d657e1..5e4e42204e1 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ReasonerFactoryAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/ReasonerFactoryAssembler.java @@ -41,7 +41,7 @@ the class up in the registry) or by class name; otherwise it defaults to Thanks to Adam Cimarosti for provoking this code and providing an example implementation. */ -public class ReasonerFactoryAssembler extends AssemblerBase implements Assembler +public class ReasonerFactoryAssembler extends AssemblerBase { @Override public Object open( Assembler a, Resource root, Mode irrelevant ) diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/RuleSetAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/RuleSetAssembler.java index e53a2d99429..969994d61b0 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/RuleSetAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/RuleSetAssembler.java @@ -24,7 +24,7 @@ import org.apache.jena.rdf.model.* ; import org.apache.jena.reasoner.rulesys.Rule ; -public class RuleSetAssembler extends AssemblerBase implements Assembler +public class RuleSetAssembler extends AssemblerBase { @Override public Object open( Assembler a, Resource root, Mode irrelevant ) { diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/UnionModelAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/UnionModelAssembler.java index 4186e59912d..e61599fc37a 100644 --- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/UnionModelAssembler.java +++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/UnionModelAssembler.java @@ -29,7 +29,7 @@ import org.apache.jena.rdf.model.Resource ; import org.apache.jena.rdf.model.StmtIterator ; -public class UnionModelAssembler extends ModelAssembler implements Assembler +public class UnionModelAssembler extends ModelAssembler { @Override diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java index 89c84bcccb3..d363b3fe784 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/RDFLangString.java @@ -28,7 +28,7 @@ * This is not rdf:plainLiteral! */ -public class RDFLangString extends BaseDatatype implements RDFDatatype { +public class RDFLangString extends BaseDatatype { /** Singleton instance */ // Include the string for the RDF namespace, not use RDF.getURI(), to avoid an initializer circularity public static final RDFDatatype rdfLangString = new RDFLangString("http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"); diff --git a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java index dd22430b908..f4fde40acdf 100644 --- a/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java +++ b/jena-core/src/main/java/org/apache/jena/datatypes/xsd/impl/XMLLiteralType.java @@ -37,7 +37,7 @@ * Builtin data type to represent XMLLiteral (i.e. items created * by use of rdf:parsetype='literal'. */ -public class XMLLiteralType extends BaseDatatype implements RDFDatatype { +public class XMLLiteralType extends BaseDatatype { /** Singleton instance */ // Include the string for the RDF namespace, not use RDF.getURI(), to avoid an initializer circularity public static final RDFDatatype theXMLLiteralType = new XMLLiteralType("http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral"); diff --git a/jena-core/src/main/java/org/apache/jena/graph/compose/Delta.java b/jena-core/src/main/java/org/apache/jena/graph/compose/Delta.java index b35ff68b64f..91949c20167 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/compose/Delta.java +++ b/jena-core/src/main/java/org/apache/jena/graph/compose/Delta.java @@ -31,7 +31,7 @@ * while this graph is in use. */ -public class Delta extends CompositionBase implements Graph +public class Delta extends CompositionBase { private Graph base ; private Graph additions ; diff --git a/jena-core/src/main/java/org/apache/jena/graph/compose/Difference.java b/jena-core/src/main/java/org/apache/jena/graph/compose/Difference.java index e37f40e7d45..f46d978e095 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/compose/Difference.java +++ b/jena-core/src/main/java/org/apache/jena/graph/compose/Difference.java @@ -25,7 +25,7 @@ Class representing the dynamic set difference L - R of two graphs. This is updatable; the updates are written through to one or other of the base graphs. */ -public class Difference extends Dyadic implements Graph +public class Difference extends Dyadic { /** Initialise a graph representing the difference L - R. diff --git a/jena-core/src/main/java/org/apache/jena/graph/compose/Intersection.java b/jena-core/src/main/java/org/apache/jena/graph/compose/Intersection.java index 90bfcb573f4..5df90e7acf7 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/compose/Intersection.java +++ b/jena-core/src/main/java/org/apache/jena/graph/compose/Intersection.java @@ -31,7 +31,7 @@ /** The dynamic intersection of two graphs L and R. add() affects both L and R, whereas delete() affects L only. */ -public class Intersection extends Dyadic implements Graph +public class Intersection extends Dyadic { public Intersection( Graph L, Graph R ) { diff --git a/jena-core/src/main/java/org/apache/jena/graph/compose/PolyadicPrefixMappingImpl.java b/jena-core/src/main/java/org/apache/jena/graph/compose/PolyadicPrefixMappingImpl.java index 2a31edf0d5b..e70dfc02421 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/compose/PolyadicPrefixMappingImpl.java +++ b/jena-core/src/main/java/org/apache/jena/graph/compose/PolyadicPrefixMappingImpl.java @@ -26,7 +26,7 @@ import org.apache.jena.util.CollectionFactory ; -public class PolyadicPrefixMappingImpl extends PrefixMappingImpl implements PrefixMapping +public class PolyadicPrefixMappingImpl extends PrefixMappingImpl { private Polyadic poly; private PrefixMapping pending = new PrefixMappingImpl(); diff --git a/jena-core/src/main/java/org/apache/jena/graph/compose/Union.java b/jena-core/src/main/java/org/apache/jena/graph/compose/Union.java index 7375b61e509..72efb5793eb 100644 --- a/jena-core/src/main/java/org/apache/jena/graph/compose/Union.java +++ b/jena-core/src/main/java/org/apache/jena/graph/compose/Union.java @@ -31,7 +31,7 @@ @see MultiUnion */ -public class Union extends Dyadic implements Graph +public class Union extends Dyadic { public Union( Graph L, Graph R ) { super( L, R ); } diff --git a/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStore.java b/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStore.java index 5a915a60cac..cf8ef07b9e2 100644 --- a/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStore.java +++ b/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStore.java @@ -20,7 +20,6 @@ import org.apache.jena.graph.* ; import org.apache.jena.graph.Triple.* ; -import org.apache.jena.graph.impl.TripleStore ; /** GraphTripleStore - the underlying triple-indexed triple store for GraphMem et al, @@ -29,7 +28,7 @@ */ -public class GraphTripleStore extends GraphTripleStoreBase implements TripleStore +public class GraphTripleStore extends GraphTripleStoreBase { public GraphTripleStore( Graph parent ) { diff --git a/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreMem.java b/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreMem.java index 38974581ce6..3f44461071e 100644 --- a/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreMem.java +++ b/jena-core/src/main/java/org/apache/jena/mem/GraphTripleStoreMem.java @@ -20,9 +20,8 @@ import org.apache.jena.graph.Graph ; import org.apache.jena.graph.Triple.Field ; -import org.apache.jena.graph.impl.TripleStore ; -public class GraphTripleStoreMem extends GraphTripleStoreBase implements TripleStore +public class GraphTripleStoreMem extends GraphTripleStoreBase { public GraphTripleStoreMem( Graph parent ) { diff --git a/jena-core/src/main/java/org/apache/jena/ontology/AnnotationProperty.java b/jena-core/src/main/java/org/apache/jena/ontology/AnnotationProperty.java index 246ed057370..b2d99ef3235 100644 --- a/jena-core/src/main/java/org/apache/jena/ontology/AnnotationProperty.java +++ b/jena-core/src/main/java/org/apache/jena/ontology/AnnotationProperty.java @@ -21,11 +21,6 @@ package org.apache.jena.ontology; -// Imports -/////////////// -import org.apache.jena.rdf.model.* ; - - /** *

* Interface that represents the category of annotation properties in an ontology @@ -36,8 +31,7 @@ * have any annotation properties. *

*/ -public interface AnnotationProperty - extends OntProperty, Property +public interface AnnotationProperty extends OntProperty { // Constants ////////////////////////////////// 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 8d25a3e48ba..fb8bf443031 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 @@ -46,8 +46,7 @@ * model implemenations can be derived.

*/ -public class ModelCom extends EnhGraph -implements Model, PrefixMapping, Lock +public class ModelCom extends EnhGraph implements Model { private static final RDFReaderF readerFactory = new RDFReaderFImpl(); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/StAX2SAX.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/StAX2SAX.java index a4e0c3cb6b9..aea43c2486c 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/StAX2SAX.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/StAX2SAX.java @@ -185,18 +185,18 @@ static class LocatorConv implements Locator { final static LexicalHandler NO_LEXICAL_HANDLER = new LexicalHandler() { @Override - public void startDTD(String string, String string1, String string2) throws SAXException {} + public void startDTD(String string, String string1, String string2) {} @Override - public void endDTD() throws SAXException {} + public void endDTD() {} @Override - public void startEntity(String string) throws SAXException {} + public void startEntity(String string) {} @Override - public void endEntity(String string) throws SAXException {} + public void endEntity(String string) {} @Override - public void startCDATA() throws SAXException {} + public void startCDATA() {} @Override - public void endCDATA() throws SAXException {} + public void endCDATA() {} @Override - public void comment(char[] chars, int i, int i1) throws SAXException {} + public void comment(char[] chars, int i, int i1) {} }; } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java index cf8d887ce2e..d760c9ab80b 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/ARPSaxErrorHandler.java @@ -19,7 +19,6 @@ package org.apache.jena.rdfxml.xmlinput.impl; import org.apache.jena.rdf.model.RDFErrorHandler ; -import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /** * This class is not part of the API. @@ -33,17 +32,17 @@ public ARPSaxErrorHandler(RDFErrorHandler errorHandler) { } @Override - public void error(SAXParseException e) throws SAXException { + public void error(SAXParseException e) { errorHandler.error(e); } @Override - public void warning(SAXParseException e) throws SAXException { + public void warning(SAXParseException e) { errorHandler.warning(e); } @Override - public void fatalError(SAXParseException e) throws SAXException { + public void fatalError(SAXParseException e) { errorHandler.fatalError(e); } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AttributeLexer.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AttributeLexer.java index 01a79e2cafe..99c96dc14ba 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AttributeLexer.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/AttributeLexer.java @@ -20,13 +20,12 @@ import java.util.BitSet; -import org.apache.jena.rdfxml.xmlinput.ARPErrorNumbers ; import org.apache.jena.rdfxml.xmlinput.states.Frame ; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; -public class AttributeLexer extends QNameLexer implements ARPErrorNumbers { +public class AttributeLexer extends QNameLexer { public AttributeLexer(Frame f, int which, int bad) { super(f, which, bad); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java index f0680f00823..dd68037ebab 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/DefaultErrorHandler.java @@ -36,7 +36,7 @@ public DefaultErrorHandler() { } @Override - public void error(org.xml.sax.SAXParseException e) throws org.xml.sax.SAXException { + public void error(org.xml.sax.SAXParseException e) { System.err.println("Error: " + ParseException.formatMessage(e)); } @@ -47,7 +47,7 @@ public void fatalError(org.xml.sax.SAXParseException e) throws org.xml.sax.SAXEx } @Override - public void warning(org.xml.sax.SAXParseException e) throws org.xml.sax.SAXException { + public void warning(org.xml.sax.SAXParseException e) { System.err.println("Warning: " + ParseException.formatMessage(e)); // e.printStackTrace(); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java index edfd6fab327..9428298c150 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/LexicalHandlerImpl.java @@ -18,7 +18,7 @@ package org.apache.jena.rdfxml.xmlinput.impl; -import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.DefaultHandler; @@ -31,50 +31,49 @@ class LexicalHandlerImpl extends DefaultHandler implements LexicalHandler { * @see org.xml.sax.ext.LexicalHandler#endCDATA() */ @Override - public void endCDATA() throws SAXException { + public void endCDATA() { } /* (non-Javadoc) * @see org.xml.sax.ext.LexicalHandler#endDTD() */ @Override - public void endDTD() throws SAXException { + public void endDTD() { } /* (non-Javadoc) * @see org.xml.sax.ext.LexicalHandler#startCDATA() */ @Override - public void startCDATA() throws SAXException { + public void startCDATA() { } /* (non-Javadoc) * @see org.xml.sax.ext.LexicalHandler#comment(char[], int, int) */ @Override - public void comment(char[] ch, int start, int length) throws SAXException { + public void comment(char[] ch, int start, int length) throws SAXParseException { } /* (non-Javadoc) * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String) */ @Override - public void endEntity(String name) throws SAXException { + public void endEntity(String name) { } /* (non-Javadoc) * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String) */ @Override - public void startEntity(String name) throws SAXException { + public void startEntity(String name) { } /* (non-Javadoc) * @see org.xml.sax.ext.LexicalHandler#startDTD(java.lang.String, java.lang.String, java.lang.String) */ @Override - public void startDTD(String name, String publicId, String systemId) - throws SAXException { + public void startDTD(String name, String publicId, String systemId) { } } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java index 1e7f23da090..3b5b55724ee 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/SAX2RDFImpl.java @@ -20,11 +20,8 @@ import org.apache.jena.rdfxml.xmlinput.SAX2RDF ; import org.xml.sax.Attributes; -import org.xml.sax.ContentHandler; -import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; -import org.xml.sax.ext.LexicalHandler; /** * This class is public merely to reduce the amount of irrelevant documentation * generated by Javadoc for {@link SAX2RDF}. @@ -33,8 +30,7 @@ * implements the functionality needed by {@link SAX2RDF}. The API given here * is the familiar SAX. */ -public class SAX2RDFImpl extends XMLHandler implements LexicalHandler, - ContentHandler, ErrorHandler { +public class SAX2RDFImpl extends XMLHandler { private int depth; final private String lang; protected SAX2RDFImpl(String base, String l) { @@ -51,7 +47,7 @@ protected void initParse(String b) throws SAXParseException { * @see org.xml.sax.ext.LexicalHandler#endCDATA() */ @Override - public void endCDATA() throws SAXException { + public void endCDATA() { if (depth > 0) super.endCDATA(); @@ -63,7 +59,7 @@ public void endCDATA() throws SAXException { * @see org.xml.sax.ext.LexicalHandler#endDTD() */ @Override - public void endDTD() throws SAXException { + public void endDTD() { if (depth > 0) super.endDTD(); @@ -75,7 +71,7 @@ public void endDTD() throws SAXException { * @see org.xml.sax.ext.LexicalHandler#startCDATA() */ @Override - public void startCDATA() throws SAXException { + public void startCDATA() { if (depth > 0) super.startCDATA(); @@ -99,7 +95,7 @@ public void comment(char[] ch, int start, int length) throws SAXParseException { * @see org.xml.sax.ext.LexicalHandler#endEntity(java.lang.String) */ @Override - public void endEntity(String name) throws SAXException { + public void endEntity(String name) { if (depth > 0) super.endEntity(name); @@ -111,7 +107,7 @@ public void endEntity(String name) throws SAXException { * @see org.xml.sax.ext.LexicalHandler#startEntity(java.lang.String) */ @Override - public void startEntity(String name) throws SAXException { + public void startEntity(String name) { if (depth > 0) super.startEntity(name); @@ -124,8 +120,7 @@ public void startEntity(String name) throws SAXException { * java.lang.String, java.lang.String) */ @Override - public void startDTD(String name, String publicId, String systemId) - throws SAXException { + public void startDTD(String name, String publicId, String systemId) { if (depth > 0) super.startDTD(name, publicId, systemId); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java index 9f5f0559ed0..89087816147 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLBaselessContext.java @@ -20,9 +20,8 @@ import org.xml.sax.SAXParseException; import org.apache.jena.iri.IRI; -import org.apache.jena.rdfxml.xmlinput.ARPErrorNumbers ; -public class XMLBaselessContext extends AbsXMLContext implements ARPErrorNumbers { +public class XMLBaselessContext extends AbsXMLContext { final int errno; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLContext.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLContext.java index ff8052346fb..9887e7b9382 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLContext.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLContext.java @@ -25,7 +25,6 @@ package org.apache.jena.rdfxml.xmlinput.impl; import org.apache.jena.iri.IRI ; -import org.apache.jena.rdfxml.xmlinput.ARPErrorNumbers ; import org.xml.sax.SAXParseException ; /** @@ -33,7 +32,7 @@ * Both the baseURI and the lang may be tainted with errors. They should not be * accessed without providing a taint object to propogate such tainting. */ -public class XMLContext extends AbsXMLContext implements ARPErrorNumbers +public class XMLContext extends AbsXMLContext { // final private String base; diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java index 5975a0ea24b..5ba86e97b55 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/impl/XMLHandler.java @@ -152,8 +152,7 @@ Object getUserData(String nodeId) { } @Override - public void comment(char[] ch, int start, int length) - throws SAXParseException { + public void comment(char[] ch, int start, int length) throws SAXParseException { frame.comment(ch, start, length); } diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java index be9ebc70408..3363b529b6a 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/AbsXMLLiteral.java @@ -171,7 +171,7 @@ public void characters(char[] chrs, int start, int length) throws SAXParseExcept } @Override - public void comment(char[] ch, int start, int length) throws SAXParseException { + public void comment(char[] ch, int start, int length) { append(""); diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/Frame.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/Frame.java index 0b1f11072b5..a027794024e 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/Frame.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/Frame.java @@ -18,13 +18,11 @@ package org.apache.jena.rdfxml.xmlinput.states; -import org.apache.jena.rdfxml.xmlinput.ARPErrorNumbers ; import org.apache.jena.rdfxml.xmlinput.impl.* ; import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; -public abstract class Frame extends ParserSupport implements Names, FrameI, - ARPErrorNumbers { +public abstract class Frame extends ParserSupport implements FrameI { final FrameI parent; protected boolean nonWhiteMsgGiven = false; @@ -62,8 +60,7 @@ public void afterChild() { } @Override - public void comment(char[] ch, int start, int length) - throws SAXParseException { + public void comment(char[] ch, int start, int length) { // generally ignore } @@ -73,8 +70,7 @@ public void comment(char[] ch, int start, int length) /** * endElement is called on the state of the frame created by the matching * startElement. - * - * @throws SAXParseException + * @throws SAXParseException * */ @Override diff --git a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/WantTypedLiteral.java b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/WantTypedLiteral.java index 7dbc443a99d..0482793f1a8 100644 --- a/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/WantTypedLiteral.java +++ b/jena-core/src/main/java/org/apache/jena/rdfxml/xmlinput/states/WantTypedLiteral.java @@ -24,7 +24,7 @@ import org.xml.sax.Attributes; import org.xml.sax.SAXParseException; -public class WantTypedLiteral extends AbsWantLiteralValueOrDescription implements FrameI { +public class WantTypedLiteral extends AbsWantLiteralValueOrDescription { final URIReference dtURI; public WantTypedLiteral(WantsObjectFrameI p, String datatypeURI, AbsXMLContext ap) diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java index ca2d84c815b..7dababa582c 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/BaseInfGraph.java @@ -164,7 +164,7 @@ public TransactionHandler getTransactionHandler() { return new InfTransactionHandler( this ); } public static class InfTransactionHandler - extends TransactionHandlerBase implements TransactionHandler + extends TransactionHandlerBase { protected final BaseInfGraph base; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java index 7b7723161d7..205cc97a218 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMicroReasoner.java @@ -37,7 +37,7 @@ * There is some experimental support for the cheaper class restriction handlingly which * should not be relied on at this point. */ -public class OWLMicroReasoner extends GenericRuleReasoner implements Reasoner { +public class OWLMicroReasoner extends GenericRuleReasoner { /** The location of the OWL rule definitions on the class path */ protected static final String MICRO_RULE_FILE = "etc/owl-fb-micro.rules"; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java index 92e273b82b4..aca9abab0ca 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/OWLMiniReasoner.java @@ -33,7 +33,7 @@ *
  • omits inheritance of range implications for XSD datatype ranges
    • * */ -public class OWLMiniReasoner extends GenericRuleReasoner implements Reasoner { +public class OWLMiniReasoner extends GenericRuleReasoner { /** The location of the OWL rule definitions on the class path */ protected static final String MINI_RULE_FILE = "etc/owl-fb-mini.rules"; diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java index cc055615b8e..e9b2781bc06 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/rulesys/impl/SafeGraph.java @@ -30,7 +30,7 @@ * triples and hides them from API queries so that consumers * of it are safe (but can use getRawGraph() to get back the unsafe graph. */ -public class SafeGraph extends WrappedGraph implements Graph { +public class SafeGraph extends WrappedGraph { /** Wrap a graph to hide generalized triples */ public SafeGraph(Graph base) { diff --git a/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java b/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java index a21642e224b..f7b8d0f0750 100644 --- a/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java +++ b/jena-core/src/main/java/org/apache/jena/reasoner/transitiveReasoner/TransitiveGraphCache.java @@ -92,7 +92,7 @@ static interface Visitor { * Inner class used to walk backward links of the graph. *

    The triples are dynamically allocated which is costly. */ - static class GraphWalker extends NiceIterator implements ExtendedIterator { + static class GraphWalker extends NiceIterator { /** Indicate if this is a shallow or deep walk */ boolean isDeep; @@ -215,7 +215,7 @@ protected void popStack() { /** * Inner class used to do a complete walk over the graph */ - private static class FullGraphWalker extends NiceIterator implements ExtendedIterator { + private static class FullGraphWalker extends NiceIterator { /** Flag whether we are walking over the closed or direct relations */ boolean closed; 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 ea79c7ae705..b7d5fe2edff 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 @@ -26,7 +26,7 @@ delivering them; supports remove if the underlying iterator does. */ -public class Map1Iterator extends NiceIterator implements ClosableIterator +public class Map1Iterator extends NiceIterator { private Function map; private Iterator base; diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/MapFilterIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/MapFilterIterator.java index ec49ad761b7..8d187e08dc5 100644 --- a/jena-core/src/main/java/org/apache/jena/util/iterator/MapFilterIterator.java +++ b/jena-core/src/main/java/org/apache/jena/util/iterator/MapFilterIterator.java @@ -26,7 +26,7 @@ for X from the base iterator. */ -public class MapFilterIterator extends NiceIterator implements ExtendedIterator +public class MapFilterIterator extends NiceIterator { MapFilter f; X current; diff --git a/jena-core/src/main/java/org/apache/jena/util/iterator/SingletonIterator.java b/jena-core/src/main/java/org/apache/jena/util/iterator/SingletonIterator.java index 1d36a666ff2..7acdff50dd6 100644 --- a/jena-core/src/main/java/org/apache/jena/util/iterator/SingletonIterator.java +++ b/jena-core/src/main/java/org/apache/jena/util/iterator/SingletonIterator.java @@ -21,7 +21,7 @@ /** * A ClosableIterator that contains only one element */ -public class SingletonIterator extends NiceIterator implements ExtendedIterator { +public class SingletonIterator extends NiceIterator { /** The single value to be returned */ private T item; diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestReasonerFactoryAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestReasonerFactoryAssembler.java index b521e4349d6..e4b15443673 100644 --- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestReasonerFactoryAssembler.java +++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestReasonerFactoryAssembler.java @@ -82,7 +82,7 @@ public String getURI() { return null; } } - public static class MockFactory extends MockBase implements ReasonerFactory + public static class MockFactory extends MockBase { public static final MockFactory instance = new MockFactory(); diff --git a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java index 7f5b6744e96..9b3c8e27dfe 100644 --- a/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java +++ b/jena-core/src/test/java/org/apache/jena/graph/test/TestTypedLiterals.java @@ -1018,11 +1018,11 @@ public void testDateTimeBug() { checkSerialization("---12", XSDDatatype.XSDgDay); } - private static Date getDateFromPattern(String ts, String format, String timezoneid) throws Exception { + private static Date getDateFromPattern(String ts, String format, String timezoneid) { return getDateFromPattern(ts, new String[]{format}, TimeZone.getTimeZone(timezoneid)); } - private static Date getDateFromPattern(String ts, String[] formats, TimeZone tz) throws Exception { + private static Date getDateFromPattern(String ts, String[] formats, TimeZone tz) { java.util.Date date = null; java.text.DateFormat sdf = java.text.DateFormat.getInstance(); { diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java index 6ac2fd025c8..133ab0ad5eb 100644 --- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java +++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestAllDifferent.java @@ -66,7 +66,7 @@ public OntTestCase[] getTests() { return new OntTestCase[] { new OntTestCase( "AllDifferent.distinctMembers", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); AllDifferent a = m.createAllDifferent(); OntResource b = m.getResource( NS + "b" ).as( OntResource.class ); diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java index a3e035cf57d..5a7923e6713 100644 --- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java +++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestClassExpression.java @@ -69,7 +69,7 @@ public OntTestCase[] getTests() { return new OntTestCase[] { new OntTestCase( "OntClass.super-class", true, true, true ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); @@ -96,7 +96,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.sub-class", true, true, true ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); @@ -123,7 +123,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.equivalentClass", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); @@ -150,7 +150,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.disjointWith", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); @@ -177,7 +177,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "EnumeratedClass.oneOf", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); EnumeratedClass A = m.createEnumeratedClass( NS + "A", null ); OntResource a = m.getResource( NS + "a" ).as( OntResource.class ); @@ -207,7 +207,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "IntersectionClass.intersectionOf", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); IntersectionClass A = m.createIntersectionClass( NS + "A", null ); OntClass B = m.createClass( NS + "B" ); @@ -241,7 +241,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "UnionClass.unionOf", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); UnionClass A = m.createUnionClass( NS + "A", null ); OntClass B = m.createClass( NS + "B" ); @@ -275,7 +275,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "ComplementClass.complementOf", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); ComplementClass A = m.createComplementClass( NS + "A", null ); OntClass B = m.createClass( NS + "B" ); @@ -311,7 +311,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.onProperty", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); OntProperty q = m.createObjectProperty( NS + "q" ); @@ -339,7 +339,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "AllValuesFromRestriction.allValuesFrom", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); OntClass B = m.createClass( NS + "B" ); @@ -367,7 +367,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "AllValuesFromRestriction.allValuesFrom.datatype", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); @@ -393,7 +393,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "AllValuesFromRestriction.allValuesFrom.literal", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); @@ -407,7 +407,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "AllValuesFromRestriction.allValuesFrom.datarange", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); Literal x = m.createTypedLiteral( 1 ); Literal y = m.createTypedLiteral( 2 ); @@ -430,7 +430,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "HasValueRestriction.hasValue", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); OntClass B = m.createClass( NS + "B" ); @@ -462,7 +462,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "SomeValuesFromRestriction.someValuesFrom", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); OntClass B = m.createClass( NS + "B" ); @@ -490,7 +490,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "SomeValuesFromRestriction.SomeValuesFrom.datatype", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); @@ -516,7 +516,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "SomeValuesFromRestriction.SomeValuesFrom.literal", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); @@ -530,7 +530,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "SomeValuesFromRestriction.SomeValuesFrom.datarange", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); Literal x = m.createTypedLiteral( 1 ); Literal y = m.createTypedLiteral( 2 ); @@ -553,7 +553,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "CardinalityRestriction.cardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); @@ -580,7 +580,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "MinCardinalityRestriction.minCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); @@ -607,7 +607,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "MaxCardinalityRestriction.maxCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntProperty p = m.createObjectProperty( NS + "p" ); @@ -634,7 +634,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "QualifiedRestriction.hasClassQ", false, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntProperty p = m.createObjectProperty( NS + "p" ); OntClass c = m.createClass( NS + "C" ); OntClass d = m.createClass( NS + "D" ); @@ -659,7 +659,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "CardinalityQRestriction.cardinality", false, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntProperty p = m.createObjectProperty( NS + "p" ); OntClass c = m.createClass( NS + "C" ); @@ -682,7 +682,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "MinCardinalityQRestriction.minCardinality", false, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntProperty p = m.createObjectProperty( NS + "p" ); OntClass c = m.createClass( NS + "C" ); @@ -705,7 +705,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "MaxCardinalityQRestriction.maxCardinality", false, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntProperty p = m.createObjectProperty( NS + "p" ); OntClass c = m.createClass( NS + "C" ); @@ -730,7 +730,7 @@ public void ontTest( OntModel m ) throws Exception { // from file new OntTestCase( "OntClass.subclass.fromFile", true, true, true ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { String lang = m_owlLang ? "owl" : "rdfs" ; String fileName = "file:testing/ontology/" + lang + "/ClassExpression/test.rdf"; m.read( fileName ); @@ -744,7 +744,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.equivalentClass.fromFile", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { String lang = m_owlLang ? "owl" : "rdfs" ; String fileName = "file:testing/ontology/" + lang + "/ClassExpression/test.rdf"; m.read( fileName ); @@ -757,7 +757,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.disjoint.fromFile", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { String lang = m_owlLang ? "owl" : "rdfs" ; String fileName = "file:testing/ontology/" + lang + "/ClassExpression/test.rdf"; m.read( fileName ); @@ -772,7 +772,7 @@ public void ontTest( OntModel m ) throws Exception { // type testing new OntTestCase( "OntClass.isEnumeratedClass", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass b = m.createClass( NS + "B" ); Individual x = m.createIndividual( NS + "x", b ); Individual y = m.createIndividual( NS + "y", b ); @@ -787,7 +787,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.isIntersectionClass", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass b = m.createClass( NS + "B" ); OntClass c = m.createClass( NS + "C" ); OntClass a = m.createIntersectionClass( NS + "A", m.createList( new RDFNode[] {b,c} ) ); @@ -801,7 +801,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.isUnionClass", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass b = m.createClass( NS + "B" ); OntClass c = m.createClass( NS + "C" ); OntClass a = m.createUnionClass( NS + "A", m.createList( new RDFNode[] {b,c} ) ); @@ -815,7 +815,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.isComplementClass", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass b = m.createClass( NS + "B" ); OntClass a = m.createComplementClass( NS + "A", b ); @@ -828,7 +828,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.isRestriction", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass a = m.createRestriction( null ); assertTrue( "enumerated class test not correct", m_owlLiteLang || !a.isEnumeratedClass() ); @@ -842,7 +842,7 @@ public void ontTest( OntModel m ) throws Exception { // conversion new OntTestCase( "OntClass.toEnumeratedClass", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass a = m.createClass( NS + "A" ); assertTrue( "enumerated class test not correct", !a.isEnumeratedClass() ); @@ -865,7 +865,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.toIntersectionClass", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass a = m.createClass( NS + "A" ); assertTrue( "enumerated class test not correct", m_owlLiteLang || !a.isEnumeratedClass() ); @@ -887,7 +887,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.toUnionClass", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass a = m.createClass( NS + "A" ); assertTrue( "enumerated class test not correct", !a.isEnumeratedClass() ); @@ -909,7 +909,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.toComplementClass", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass a = m.createClass( NS + "A" ); assertTrue( "enumerated class test not correct", !a.isEnumeratedClass() ); @@ -930,7 +930,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.toRestriction", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass a = m.createClass( NS + "A" ); assertTrue( "enumerated class test not correct", m_owlLiteLang || !a.isEnumeratedClass() ); @@ -954,7 +954,7 @@ public void ontTest( OntModel m ) throws Exception { // restriction type testing new OntTestCase( "Restriction.isAllValuesFrom", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass b = m.createClass( NS + "B" ); ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createAllValuesFromRestriction( null, p, b ); @@ -969,7 +969,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.isSomeValuesFrom", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass b = m.createClass( NS + "B" ); ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createSomeValuesFromRestriction( null, p, b ); @@ -984,7 +984,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.isHasValue", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass b = m.createClass( NS + "B" ); Individual x = m.createIndividual( b ); ObjectProperty p = m.createObjectProperty( NS + "p" ); @@ -1000,7 +1000,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.isCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createCardinalityRestriction( null, p, 3 ); @@ -1014,7 +1014,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.isMinCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createMinCardinalityRestriction( null, p, 1 ); @@ -1028,7 +1028,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.isMaxCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createMaxCardinalityRestriction( null, p, 5 ); @@ -1044,7 +1044,7 @@ public void ontTest( OntModel m ) throws Exception { // restriction conversions new OntTestCase( "Restriction.convertToAllValuesFrom", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createRestriction( p ); @@ -1068,7 +1068,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.convertToSomeValuesFrom", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createRestriction( p ); @@ -1092,7 +1092,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.convertToHasValue", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createRestriction( p ); @@ -1117,7 +1117,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.convertCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createRestriction( p ); @@ -1140,7 +1140,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.convertMinCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createRestriction( p ); @@ -1163,7 +1163,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "Restriction.convertMaxCardinality", true, true, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { ObjectProperty p = m.createObjectProperty( NS + "p" ); Restriction a = m.createRestriction( p ); @@ -1186,7 +1186,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.listInstances", true, true, true ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); @@ -1201,7 +1201,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.listDefinedProperties", true, true, true ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); //OntClass B = m.createClass( NS + "B" ); OntClass C = m.createClass( NS + "C" ); @@ -1232,7 +1232,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "OntClass.listDefinedProperties.notAll", true, true, true ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass C = m.createClass( NS + "C" ); C.addSuperClass(A); @@ -1254,7 +1254,7 @@ public void ontTest( OntModel m ) throws Exception { }, new OntTestCase( "DataRange.oneOf", true, false, false ) { @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Literal x = m.createTypedLiteral( 42 ); Literal y = m.createTypedLiteral( true ); Literal z = m.createTypedLiteral( "life" ); @@ -1289,7 +1289,7 @@ public void ontTest( OntModel m ) throws Exception { new OntTestCase( "Remove intersection", true, true, false ) { @Override - protected void ontTest(OntModel m) throws Exception { + protected void ontTest(OntModel m) { String ns = "http://example.com/foo#"; OntClass a = m.createClass(ns + "A"); OntClass b = m.createClass(ns + "B"); @@ -1305,7 +1305,7 @@ protected void ontTest(OntModel m) throws Exception { }, new OntTestCase( "Remove union", true, false, false ) { @Override - protected void ontTest(OntModel m) throws Exception { + protected void ontTest(OntModel m) { String ns = "http://example.com/foo#"; OntClass a = m.createClass(ns + "A"); OntClass b = m.createClass(ns + "B"); diff --git a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java index 97c7c3de114..1374aea6676 100644 --- a/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java +++ b/jena-core/src/test/java/org/apache/jena/ontology/impl/TestIndividual.java @@ -72,7 +72,7 @@ public OntTestCase[] getTests() { new OntTestCase( "Individual.sameAs", true, false, false ) { /** Note: 6/Nov/2003 - updated to use sameAs not sameIndividualAs, following changes to OWL spec */ @Override - public void ontTest( OntModel m ) throws Exception { + public void ontTest( OntModel m ) { Profile prof = m.getProfile(); OntClass A = m.createClass( NS + "A" ); Individual x = m.createIndividual( A ); @@ -101,7 +101,7 @@ public void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.hasOntClass", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); Individual x = m.createIndividual( A ); @@ -113,7 +113,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.hasOntClass direct", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); A.addSubClass( B ); @@ -132,7 +132,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.hasOntClass string", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); Individual x = m.createIndividual( A ); @@ -143,7 +143,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.getOntClass", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); Individual x = m.createIndividual( A ); @@ -153,7 +153,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.getOntClass direct", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); A.addSubClass( B ); @@ -168,7 +168,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.listOntClasses", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); A.addSubClass( B ); @@ -187,7 +187,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.listOntClasses direct", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); A.addSubClass( B ); @@ -206,7 +206,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.addOntClass", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); A.addSubClass( B ); @@ -228,7 +228,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.setOntClass", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); A.addSubClass( B ); @@ -250,7 +250,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.removeOntClass", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); OntClass B = m.createClass( NS + "B" ); @@ -272,7 +272,7 @@ protected void ontTest( OntModel m ) throws Exception { new OntTestCase( "Individual.canAs", true, true, false ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { OntClass A = m.createClass( NS + "A" ); Resource r = m.createResource( NS + "r" ); Resource s = m.createResource( NS + "s" ); @@ -290,7 +290,7 @@ protected void ontTest( OntModel m ) throws Exception { /** Test case for SF bug 945436 - a xml:lang='' in the dataset causes string index exception in getLabel() */ new OntTestCase( "Individual.canAs", true, true, true ) { @Override - protected void ontTest( OntModel m ) throws Exception { + protected void ontTest( OntModel m ) { String SOURCE= "" + " wanted, } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); SL = new RecordingModelListener(); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java index 58b81f8c73e..997dca8f31b 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestModelSetOperations.java @@ -39,14 +39,14 @@ public TestModelSetOperations( final TestingModelFactory modelFactory, } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); model2 = createModel(); } @Override - public void tearDown() throws Exception + public void tearDown() { super.tearDown(); model2.close(); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java index 2e07a44ce1e..a6794f8bc1d 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjectOfProperties.java @@ -120,7 +120,7 @@ private void processIterator( final ResIterator rIter, final boolean[] subjf ) } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); // tvLitObj = { model.createTypedLiteral(new LitTestObjF()), diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java index ea149a2f570..eb0a65d9931 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestObjects.java @@ -105,7 +105,7 @@ protected Set predicateSet( final int limit ) } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); S = model.createResource("http://nowhere.man/subject"); @@ -123,7 +123,7 @@ protected Set subjectSet( final int limit ) } @Override - public void tearDown() throws Exception + public void tearDown() { S = null; P = null; diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java index 25ce20dbab7..86c88153507 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestReifiedStatements.java @@ -61,7 +61,7 @@ public Set getSetRS( final Model m, final Statement st ) } @Override - public void setUp() throws Exception + public void setUp() { model = createModel(); final Resource S2 = model.createResource(TestReifiedStatements.anchor diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResourceMethods.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResourceMethods.java index 4c83473c70c..6b6210521c9 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResourceMethods.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestResourceMethods.java @@ -46,7 +46,7 @@ public TestResourceMethods( final TestingModelFactory modelFactory, } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); tvLiteral = model.createLiteral("test 12 string 2"); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java index 9767379049f..6de93fd61ad 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSelectorUse.java @@ -53,7 +53,7 @@ public TestSelectorUse( final TestingModelFactory modelFactory, } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); final Literal tvLitObjs[] = { diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSeqMethods.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSeqMethods.java index a4fbcd42f45..4a7c6b41a61 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSeqMethods.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSeqMethods.java @@ -84,7 +84,7 @@ protected Resource getContainerType() } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); aLitTestObj = new LitTestObj(12345); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleListStatements.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleListStatements.java index e7ad1f57df2..d4ecf8d5fd6 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleListStatements.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleListStatements.java @@ -65,7 +65,7 @@ public Model modelWithStatements( final StmtIterator it ) } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleSelector.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleSelector.java index 5d7246ca141..7a2c53dbee8 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleSelector.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestSimpleSelector.java @@ -34,7 +34,7 @@ public TestSimpleSelector( final TestingModelFactory modelFactory, } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); model.createResource().addProperty(RDF.type, RDFS.Resource) diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementCreation.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementCreation.java index 619bd85640d..24af753e72c 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementCreation.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementCreation.java @@ -41,7 +41,7 @@ public TestStatementCreation( final TestingModelFactory modelFactory, } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); r = model.createResource(TestStatementCreation.subjURI); @@ -49,7 +49,7 @@ public void setUp() throws Exception } @Override - public void tearDown() throws Exception + public void tearDown() { r = null; p = null; diff --git a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java index 9a7c1429691..12f57ba0e38 100644 --- a/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java +++ b/jena-core/src/test/java/org/apache/jena/rdf/model/test/TestStatementMethods.java @@ -58,7 +58,7 @@ protected Statement loadInitialStatement() } @Override - public void setUp() throws Exception + public void setUp() { super.setUp(); r = model.createResource(); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MemoryLeakTest.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MemoryLeakTest.java index 4d27cfdcc76..eef6c4c8e78 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MemoryLeakTest.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MemoryLeakTest.java @@ -18,7 +18,6 @@ package org.apache.jena.rdfxml.xmlinput; -import java.io.IOException; import java.io.OutputStream; import java.io.PrintStream; @@ -63,7 +62,7 @@ static void loadFile(String fileName) { PrintStream oldOut = System.out; try ( PrintStream out = new PrintStream(new OutputStream() { @Override - public void write(int b) throws IOException { + public void write(int b) { } });) { NTriple.mainEh(new String[] { "-b", "http://eg.org/", "-t", fileName }, null, null); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MoreTests.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MoreTests.java index 4ace50c95f2..83bfbd929b1 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MoreTests.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/MoreTests.java @@ -453,7 +453,7 @@ public void statement(AResource subj, AResource pred, ALiteral lit) { }); a.getHandlers().setErrorHandler(new ErrorHandler(){ @Override - public void error(SAXParseException exception) throws SAXException { + public void error(SAXParseException exception) { throw new RuntimeException("Unexpected error", exception); } @Override @@ -461,7 +461,7 @@ public void fatalError(SAXParseException exception) throws SAXException { throw exception; } @Override - public void warning(SAXParseException exception) throws SAXException { + public void warning(SAXParseException exception) { throw new RuntimeException("Unexpected warning", exception); }}); try { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java index f5ae838735e..3d807177bc3 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/NTripleTestSuite.java @@ -33,7 +33,6 @@ import org.apache.jena.rdfxml.xmlinput.impl.ARPSaxErrorHandler ; import org.apache.jena.shared.wg.TestInputStreamFactory ; import org.junit.Assert ; -import org.xml.sax.SAXException ; import org.xml.sax.SAXParseException ; /** @@ -69,7 +68,7 @@ static class SimulatedException extends RuntimeException { } static class TestHandler extends ARPSaxErrorHandler - implements ARPEventHandler, org.xml.sax.ErrorHandler { + implements ARPEventHandler { TestHandler(RDFErrorHandler eh) { this(eh, 0); } @@ -213,7 +212,7 @@ public void atEndOfFile() { * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException) */ @Override - public void error(SAXParseException exception) throws SAXException { + public void error(SAXParseException exception) { hasErrors = true; super.error(exception); @@ -223,8 +222,7 @@ public void error(SAXParseException exception) throws SAXException { * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException) */ @Override - public void fatalError(SAXParseException exception) - throws SAXException { + public void fatalError(SAXParseException exception) { hasErrors = true; super.fatalError(exception); @@ -273,7 +271,7 @@ static Model loadRDFx( out = new PrintStream(new OutputStream() { @Override - public void write(int b) throws IOException { + public void write(int b) { } }); th = new TestHandler(eh, cnt); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java index 7984a32a8c0..34f88bc66b8 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/WGTestSuite.java @@ -32,7 +32,9 @@ import junit.framework.TestCase; import junit.framework.TestSuite; + import org.xml.sax.SAXException; +import org.apache.jena.atlas.RuntimeIOException; import org.apache.jena.iri.IRI; import org.apache.jena.iri.IRIFactory; import org.apache.jena.rdf.model.* ; @@ -381,7 +383,7 @@ class ReasoningTest extends Test { super(r); } @Override - protected void runTest() throws IOException { + protected void runTest() { int rslt = WGReasonerTester.FAIL; try { JenaParameters.enableWhitespaceCheckingOfTypedLiterals = true; @@ -389,7 +391,9 @@ protected void runTest() throws IOException { .addProperty(ReasonerVocabulary.PROPsetRDFSLevel, "full"); rslt = wgReasoner.runTestDetailedResponse(testID.getURI(), RDFSRuleReasonerFactory.theInstance(),this,config); - } finally { + } catch (IOException e) { + throw new RuntimeIOException(e); + } finally { logResult(testID,rslt); } // assertTrue(rslt>=0); @@ -449,7 +453,7 @@ Model read(Property p) throws IOException { new InFactoryX(){ @Override - public InputStream open() throws IOException { + public InputStream open() { return factory.open(uri); } } @@ -460,7 +464,7 @@ public InputStream open() throws IOException { return null; } @Override - protected void runTest() throws IOException { + protected void runTest() { int rslt = WGReasonerTester.FAIL; try { reallyRunTest(); @@ -738,7 +742,7 @@ Model read(String file, boolean type) throws IOException { new InFactoryX(){ @Override - public InputStream open() throws IOException { + public InputStream open() { return factory.open(uri); } } diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/states/TestEventList.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/states/TestEventList.java index 98a6151d368..d87a0698d8e 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/states/TestEventList.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmlinput/states/TestEventList.java @@ -23,7 +23,7 @@ import junit.framework.TestSuite; import org.apache.jena.rdfxml.xmlinput.states.FrameI ; -public class TestEventList extends TestCase implements Test { +public class TestEventList extends TestCase { final EventRecord record1, record2; diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/PrettyWriterTest.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/PrettyWriterTest.java index 7967d3e3c69..97d890d1469 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/PrettyWriterTest.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/PrettyWriterTest.java @@ -159,7 +159,7 @@ public void test803804() { try { m0.write(new OutputStream() { @Override - public void write(int b) throws IOException { + public void write(int b) { } }, "RDF/XML-ABBREV"); diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestLiteralEncoding.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestLiteralEncoding.java index 3802ce16684..1f4747b1b61 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestLiteralEncoding.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestLiteralEncoding.java @@ -101,11 +101,11 @@ private void testThrowsBadCharacterException( char badChar, String lang ) m.createResource().addProperty(RDF.value, badString); Writer w = new Writer(){ @Override - public void close() throws IOException {} + public void close() {} @Override - public void flush() throws IOException {} + public void flush() {} @Override - public void write(char[] arg0, int arg1, int arg2) throws IOException {} + public void write(char[] arg0, int arg1, int arg2) {} }; try { diff --git a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java index 3f6e9e76c45..bee5496e6ec 100644 --- a/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java +++ b/jena-core/src/test/java/org/apache/jena/rdfxml/xmloutput/TestXMLFeatures.java @@ -64,7 +64,7 @@ public void SUPPRESSEDtestRelativeURI() { m.createResource("foo").addProperty(RDF.value, "bar"); m.write(new OutputStream() { @Override - public void write(int b) throws IOException { + public void write(int b) { } }, lang); } @@ -81,7 +81,7 @@ public void SUPPRESStestNoStripes() throws IOException { * j.0 defined (eg it was read in from a model we wrote out earlier) wants * to allocate a new j.* prefix and picked j.0, BOOM. */ - public void SUPPRESSEDtestBrokenPrefixing() throws Exception { + public void SUPPRESSEDtestBrokenPrefixing() { Model m = ModelFactory.createDefaultModel(); m.add(ModelTestBase.statement(m, "a http://bingle.bongle/booty#PP b")); m.add(ModelTestBase.statement(m, "c http://dingle.dongle/dooty#PP d")); diff --git a/jena-core/src/test/java/org/apache/jena/util/iterator/test/LoggingClosableIterator.java b/jena-core/src/test/java/org/apache/jena/util/iterator/test/LoggingClosableIterator.java index e9be8578b0e..62dc7e8d7ab 100644 --- a/jena-core/src/test/java/org/apache/jena/util/iterator/test/LoggingClosableIterator.java +++ b/jena-core/src/test/java/org/apache/jena/util/iterator/test/LoggingClosableIterator.java @@ -26,7 +26,7 @@ A closable iterator that wraps a base iterator and reports whether or not it has been closed. */ -public class LoggingClosableIterator extends WrappedIterator implements ClosableIterator +public class LoggingClosableIterator extends WrappedIterator { protected LoggingClosableIterator( Iterator< ? extends T> base ) { super( base ); } diff --git a/jena-csv/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java b/jena-csv/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java index a4bed3a347b..b81f37feb88 100644 --- a/jena-csv/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java +++ b/jena-csv/src/test/java/org/apache/jena/propertytable/graph/GraphCSVTest.java @@ -40,7 +40,7 @@ public static void init(){ } @Test - public void testGraphCSV() throws Exception { + public void testGraphCSV() { //String file = "src/test/resources/HEFCE_organogram_senior_data_31032011.csv";test.csv String file = "src/test/resources/test.csv"; @@ -62,7 +62,7 @@ public void testGraphCSV() throws Exception { } @Test - public void stageGeneratorTest() throws Exception{ + public void stageGeneratorTest(){ wireIntoExecution(); testGraphCSV(); } diff --git a/jena-iri/src/main/java/org/apache/jena/iri/IRI.java b/jena-iri/src/main/java/org/apache/jena/iri/IRI.java index 209803f54da..0e5491970a2 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/IRI.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/IRI.java @@ -56,7 +56,7 @@ * of a different appropriately configured {@link IRIFactory}. *

    */ -abstract public class IRI extends AbsIRIFactoryImpl implements IRIFactoryI, IRIRelativize { +abstract public class IRI extends AbsIRIFactoryImpl implements IRIRelativize { /** * Advanced usage only: diff --git a/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java b/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java index 2c0eedcad5d..d3b8a33e295 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/IRIFactory.java @@ -99,9 +99,7 @@ * have order dependencies.

    */ -public class IRIFactory extends IRIFactoryImpl - implements - IRIFactoryI { +public class IRIFactory extends IRIFactoryImpl { static { // call static initializers diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/IRIImpl.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/IRIImpl.java index f2dc6bf05b3..cc1743db417 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/impl/IRIImpl.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/IRIImpl.java @@ -19,12 +19,10 @@ package org.apache.jena.iri.impl; -import org.apache.jena.iri.IRIComponents ; import org.apache.jena.iri.IRIFactory ; public class IRIImpl - extends AbsIRIImpl -implements IRIComponents { + extends AbsIRIImpl { final IRIFactoryImpl factory; final String original; diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java index c25722205ab..ecfa25bae00 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPath.java @@ -26,7 +26,7 @@ * on 04/03/12 16:02 from the specification file * tmp.jflex */ -class LexerPath extends AbsLexer implements org.apache.jena.iri.ViolationCodes, org.apache.jena.iri.IRIComponents, Lexer { +class LexerPath extends AbsLexer implements org.apache.jena.iri.IRIComponents, Lexer { /** This character denotes the end of file */ private static final int YYEOF = -1; diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java index e2b055a0f8e..1e7f0032982 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerPort.java @@ -26,7 +26,7 @@ * on 04/03/12 16:02 from the specification file * src/main/jflex/org/apache/jena/iri/impl/port.jflex */ -class LexerPort extends AbsLexer implements org.apache.jena.iri.ViolationCodes, org.apache.jena.iri.IRIComponents, Lexer { +class LexerPort extends AbsLexer implements org.apache.jena.iri.IRIComponents, Lexer { /** This character denotes the end of file */ private static final int YYEOF = -1; diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java index 8b426a27713..5168690735a 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerQuery.java @@ -26,7 +26,7 @@ * on 04/03/12 16:02 from the specification file * tmp.jflex */ -class LexerQuery extends AbsLexer implements org.apache.jena.iri.ViolationCodes, org.apache.jena.iri.IRIComponents, Lexer { +class LexerQuery extends AbsLexer implements org.apache.jena.iri.IRIComponents, Lexer { /** This character denotes the end of file */ private static final int YYEOF = -1; diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java index 811fea1b622..e374e965056 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerScheme.java @@ -26,7 +26,7 @@ * on 04/03/12 16:02 from the specification file * src/main/jflex/org/apache/jena/iri/impl/scheme.jflex */ -class LexerScheme extends AbsLexer implements org.apache.jena.iri.ViolationCodes, org.apache.jena.iri.IRIComponents, Lexer { +class LexerScheme extends AbsLexer implements org.apache.jena.iri.IRIComponents, Lexer { /** This character denotes the end of file */ private static final int YYEOF = -1; diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java index c6c37ef7a32..e40cfa2a1de 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerUserinfo.java @@ -26,7 +26,7 @@ * on 04/03/12 16:02 from the specification file * tmp.jflex */ -class LexerUserinfo extends AbsLexer implements org.apache.jena.iri.ViolationCodes, org.apache.jena.iri.IRIComponents, Lexer { +class LexerUserinfo extends AbsLexer implements org.apache.jena.iri.IRIComponents, Lexer { /** This character denotes the end of file */ private static final int YYEOF = -1; diff --git a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java index 119e287b060..58628063ed5 100644 --- a/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java +++ b/jena-iri/src/main/java/org/apache/jena/iri/impl/LexerXHost.java @@ -26,7 +26,7 @@ * on 04/03/12 16:02 from the specification file * tmp.jflex */ -class LexerXHost extends AbsLexer implements org.apache.jena.iri.ViolationCodes, org.apache.jena.iri.IRIComponents, Lexer { +class LexerXHost extends AbsLexer implements org.apache.jena.iri.IRIComponents, Lexer { /** This character denotes the end of file */ private static final int YYEOF = -1; diff --git a/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java b/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java index 4022b53394f..94489f55540 100644 --- a/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java +++ b/jena-iri/src/test/java/org/apache/jena/iri/TestIRIFactory.java @@ -32,7 +32,7 @@ static public junit.framework.Test suite() { private static IRIFactory iriFactory = IRIFactory.jenaImplementation(); @Test - public void createFromURI() throws Exception { + public void createFromURI() { URI uri = URI.create("http://johndoe:secret@example.com:81/page?2#hash"); IRI iri = iriFactory.create(uri); assertEquals("http", iri.getScheme()); diff --git a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java index bb4814f7105..d20e421d969 100644 --- a/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java +++ b/jena-permissions/src/main/java/org/apache/jena/permissions/SecurityEvaluatorAssembler.java @@ -102,7 +102,7 @@ *

    * */ -public class SecurityEvaluatorAssembler extends AssemblerBase implements Assembler, AssemblerConstants { +public class SecurityEvaluatorAssembler extends AssemblerBase implements AssemblerConstants { // initialization and registration is performed by SecuredAssembler @Override diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java index db6b55d3de3..4e7a024a67b 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/SecuredAssemblerTest.java @@ -48,7 +48,7 @@ public void setUp() throws Exception { } @Test - public void testCreation() throws Exception { + public void testCreation() { Resource r = model.createResource( "http://apache.org/jena/permissions/test#secModel"); Object o = assembler.open( r ); @@ -57,7 +57,7 @@ public void testCreation() throws Exception { } @Test - public void testCreationWithArgs() throws Exception { + public void testCreationWithArgs() { Resource r = model.createResource( "http://apache.org/jena/permissions/test#secModel2"); Object o = assembler.open( r ); @@ -66,7 +66,7 @@ public void testCreationWithArgs() throws Exception { } @Test - public void testSecurityEvaluatorWithStringArgs() throws Exception { + public void testSecurityEvaluatorWithStringArgs() { Resource r = model.createResource( "http://apache.org/jena/permissions/test#secEvaluator"); Object o = assembler.open( r ); @@ -75,7 +75,7 @@ public void testSecurityEvaluatorWithStringArgs() throws Exception { } @Test - public void testSecurityEvaluatorWithModelArgs() throws Exception { + public void testSecurityEvaluatorWithModelArgs() { Resource r = model.createResource( "http://apache.org/jena/permissions/test#secEvaluator2"); Object o = assembler.open( r ); diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java index a69ebc501b5..45ac5a5c6ac 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/contract/model/SecTestPackage.java @@ -17,8 +17,6 @@ */ package org.apache.jena.permissions.contract.model; -import java.lang.reflect.InvocationTargetException; - import junit.framework.TestSuite; import org.apache.jena.atlas.web.TypedInputStream; @@ -41,12 +39,12 @@ //@RunWith(ModelTestSuite.class) public class SecTestPackage extends AbstractTestPackage { - static public TestSuite suite() throws SecurityException, IllegalArgumentException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException + static public TestSuite suite() throws SecurityException, IllegalArgumentException { return new SecTestPackage(); } - public SecTestPackage() throws SecurityException, IllegalArgumentException, NoSuchMethodException, InstantiationException, IllegalAccessException, InvocationTargetException + public SecTestPackage() throws SecurityException, IllegalArgumentException { super("SecuredModel", new PlainModelFactory() ); // register a jar reader here diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java index 4a99c5c6c59..ffb56044072 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/GraphEventManagerTest.java @@ -17,14 +17,12 @@ */ package org.apache.jena.permissions.graph; -import java.util.Arrays; import java.util.Set; import org.apache.jena.graph.Graph ; import org.apache.jena.graph.GraphEventManager ; import org.apache.jena.graph.NodeFactory ; import org.apache.jena.graph.Triple ; -import org.apache.jena.graph.impl.CollectionGraph ; import org.apache.jena.permissions.Factory; import org.apache.jena.permissions.MockSecurityEvaluator; import org.apache.jena.permissions.SecurityEvaluator; diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java index bc086b4bf9a..940a699b21b 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/MemGraphTest.java @@ -17,7 +17,6 @@ */ package org.apache.jena.permissions.graph; -import java.lang.reflect.Method; import java.util.Set; import org.apache.jena.graph.* ; @@ -51,14 +50,13 @@ public MemGraphTest( final MockSecurityEvaluator securityEvaluator ) this.securityEvaluator = securityEvaluator; } - protected Graph createGraph() throws Exception + protected Graph createGraph() { return GraphFactory.createDefaultGraph(); } - @SuppressWarnings("deprecation") - @Before - public void setUp() throws Exception + @Before + public void setUp() { baseGraph = createGraph(); baseGraph.remove(Node.ANY, Node.ANY, Node.ANY); @@ -73,7 +71,7 @@ public void setUp() throws Exception } @Test - public void testContainsNodes() throws Exception + public void testContainsNodes() { try { @@ -95,7 +93,7 @@ public void testContainsNodes() throws Exception } @Test - public void testContainsTriple() throws Exception + public void testContainsTriple() { try { @@ -118,7 +116,7 @@ public void testContainsTriple() throws Exception } @Test - public void testDelete() throws Exception + public void testDelete() { final Set UD = SecurityEvaluator.Util.asSet(new Action[] { Action.Update, Action.Delete }); @@ -145,7 +143,7 @@ public void testDelete() throws Exception } @Test - public void testDependsOn() throws Exception + public void testDependsOn() { try { @@ -185,7 +183,7 @@ public void testDependsOn() throws Exception } @Test - public void testFindNodes() throws Exception + public void testFindNodes() { try { @@ -209,7 +207,7 @@ public void testFindNodes() throws Exception } @Test - public void testFindTriple() throws Exception + public void testFindTriple() { try { @@ -250,7 +248,7 @@ public void testInequality() } @Test - public void testIsIsomorphicWith() throws Exception + public void testIsIsomorphicWith() { try { @@ -290,7 +288,7 @@ public void testIsIsomorphicWith() throws Exception } @Test - public void testSize() throws Exception + public void testSize() { try { diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java index 18be198cd0e..1fa0e3c23eb 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/graph/TDBGraphTest.java @@ -18,8 +18,6 @@ package org.apache.jena.permissions.graph; import java.io.File; -import java.io.IOException; - import org.apache.jena.graph.Graph ; import org.apache.jena.permissions.MockSecurityEvaluator; import org.apache.jena.sparql.core.DatasetGraph ; @@ -40,7 +38,7 @@ public TDBGraphTest( final MockSecurityEvaluator securityEvaluator ) } @Override - protected Graph createGraph() throws IOException + protected Graph createGraph() { TDB.init(); dsGraph = TDBFactory.createDataset().asDatasetGraph(); diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java index 28b33bae23a..e6001f9f800 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelDetailTest.java @@ -252,8 +252,8 @@ private boolean evaluate( Resource r ) // a message is only available to sender or recipient if (r.hasProperty( RDF.type, msgType )) { - return r.hasProperty( pTo, ((Principal)principal).getName() ) || - r.hasProperty( pFrom, ((Principal)principal).getName()); + return r.hasProperty( pTo, principal.getName() ) || + r.hasProperty( pFrom, principal.getName()); } return true; } diff --git a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java index 6280a332e1e..8e0d6c158ae 100644 --- a/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java +++ b/jena-permissions/src/test/java/org/apache/jena/permissions/model/SecuredModelTest.java @@ -18,6 +18,7 @@ package org.apache.jena.permissions.model; import java.io.* ; +import java.net.MalformedURLException; import java.net.URL ; import java.util.ArrayList ; import java.util.List ; @@ -77,7 +78,7 @@ public void setup() } @Test - public void testAdd() throws Exception + public void testAdd() { final List stmt = baseModel.listStatements().toList(); final Set createAndUpdate = SecurityEvaluator.Util @@ -285,7 +286,7 @@ public void testAnonymousInModel() } @Test - public void testAsRDFNode() throws Exception + public void testAsRDFNode() { securedModel.asRDFNode(NodeFactory.createURI("http://example.com/rdfNode")); } @@ -314,7 +315,7 @@ public void testAsStatement() } @Test - public void testContains() throws Exception + public void testContains() { final Statement stmt = baseModel.listStatements().next(); try @@ -407,7 +408,7 @@ public void testContains() throws Exception } @Test - public void testContainsAll() throws Exception + public void testContainsAll() { try { @@ -446,7 +447,7 @@ public void testContainsAll() throws Exception } @Test - public void testCreateAlt() throws Exception + public void testCreateAlt() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -487,7 +488,7 @@ public void testCreateAlt() throws Exception } @Test - public void testCreateBag() throws Exception + public void testCreateBag() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -528,7 +529,7 @@ public void testCreateBag() throws Exception } @Test - public void testCreateList() throws Exception + public void testCreateList() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Update, Action.Create }); @@ -600,14 +601,14 @@ public void testCreateList() throws Exception } @Test - public void testCreateLiteral() throws Exception + public void testCreateLiteral() { securedModel.createLiteral("foo"); securedModel.createLiteral("foo", false); } @Test - public void testCreateLiteralBoolean() throws Exception + public void testCreateLiteralBoolean() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -632,7 +633,7 @@ public void testCreateLiteralBoolean() throws Exception } @Test - public void testCreateLiteralChar() throws Exception + public void testCreateLiteralChar() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -656,7 +657,7 @@ public void testCreateLiteralChar() throws Exception } @Test - public void testCreateLiteralDouble() throws Exception + public void testCreateLiteralDouble() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -681,7 +682,7 @@ public void testCreateLiteralDouble() throws Exception } @Test - public void testCreateLiteralFloat() throws Exception + public void testCreateLiteralFloat() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -706,7 +707,7 @@ public void testCreateLiteralFloat() throws Exception } @Test - public void testCreateLiteralInt() throws Exception + public void testCreateLiteralInt() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -732,7 +733,7 @@ public void testCreateLiteralInt() throws Exception } @Test - public void testCreateLiteralLong() throws Exception + public void testCreateLiteralLong() { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -757,7 +758,7 @@ public void testCreateLiteralLong() throws Exception } @Test - public void testCreateLiteralObject() throws Exception + public void testCreateLiteralObject() throws MalformedURLException { final Set CU = SecurityEvaluator.Util.asSet(new Action[] { Action.Create, Action.Update }); @@ -783,7 +784,7 @@ public void testCreateLiteralObject() throws Exception } @Test - public void testDifference() throws Exception + public void testDifference() { try { @@ -805,14 +806,14 @@ public void testDifference() throws Exception } @Test - public void testEquals() throws Exception + public void testEquals() { securedModel.equals(baseModel); baseModel.equals(securedModel); } @Test - public void testExpandPrefix() throws Exception + public void testExpandPrefix() { try { @@ -834,7 +835,7 @@ public void testExpandPrefix() throws Exception } @Test - public void testGetAlt() throws Exception + public void testGetAlt() { final Resource a = baseModel .createAlt("http://example.com/securedModel/alt"); @@ -967,7 +968,7 @@ public void testGetBag() } @Test - public void testGetGraph() throws Exception + public void testGetGraph() { final Graph g = securedModel.getGraph(); Assert.assertTrue(g instanceof SecuredGraph); @@ -1038,7 +1039,7 @@ public void testGetProperty() } @Test - public void testGetQNameFor() throws Exception + public void testGetQNameFor() { try { @@ -1144,13 +1145,13 @@ public void testGetWriter() } @Test - public void testIndependent() throws Exception + public void testIndependent() { Assert.assertFalse(securedModel.independent()); } @Test - public void testIntersection() throws Exception + public void testIntersection() { try { @@ -1172,13 +1173,13 @@ public void testIntersection() throws Exception } @Test - public void testIsClosed() throws Exception + public void testIsClosed() { securedModel.isClosed(); } @Test - public void testIsEmpty() throws Exception + public void testIsEmpty() { try { @@ -1263,7 +1264,7 @@ public void testIsReified() } @Test - public void testListLiteralStatements() throws Exception + public void testListLiteralStatements() { try { @@ -1353,7 +1354,7 @@ public void testListLiteralStatements() throws Exception } @Test - public void testLock() throws Exception + public void testLock() { try { @@ -1381,7 +1382,7 @@ public void testPrefixMapping() throws Exception } @Test - public void testQuery() throws Exception + public void testQuery() { final Selector s = new SimpleSelector(); try @@ -1416,7 +1417,7 @@ public void testRDFNodeInModel() } @Test - public void testReadEmpty() throws Exception + public void testReadEmpty() { final Set createAndUpdate = SecurityEvaluator.Util .asSet(new Action[] { Action.Update, Action.Create }); @@ -1597,7 +1598,7 @@ public void testReadEmpty() throws Exception } @Test - public void testRemove() throws Exception + public void testRemove() { final Set DU = SecurityEvaluator.Util.asSet(new Action[] { Action.Delete, Action.Update }); @@ -1731,7 +1732,7 @@ public void testRemove() throws Exception } @Test - public void testRemoveAll() throws Exception + public void testRemoveAll() { final Set DU = SecurityEvaluator.Util.asSet(new Action[] { Action.Delete, Action.Update }); @@ -1827,7 +1828,7 @@ public void testRequiredProperty() } @Test - public void testSize() throws Exception + public void testSize() { try { @@ -1849,7 +1850,7 @@ public void testSize() throws Exception } @Test - public void testUnion() throws Exception + public void testUnion() { try { @@ -1917,13 +1918,13 @@ public void testVariableInModel() } @Test - public void testWrapAsResource() throws Exception + public void testWrapAsResource() { securedModel.wrapAsResource(NodeFactory.createURI("http://example.com/rdfNode")); } @Test - public void testWrite() throws Exception + public void testWrite() { final OutputStream out = new ByteArrayOutputStream(); final Writer writer = new CharArrayWriter(); From 3415854052216d5aa3bccf3abd77081f4685fabd Mon Sep 17 00:00:00 2001 From: ajs6f Date: Mon, 11 May 2015 15:02:10 -0400 Subject: [PATCH 2/3] Reseting SPARQL test gear from javacc --- .../org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java | 2 +- .../org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java index ad1a7101420..d3049f7803f 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_10/SPARQLParser10.java @@ -33,7 +33,7 @@ //This is javacc generated code @SuppressWarnings("all") -public class SPARQLParser10 extends SPARQLParser10Base { +public class SPARQLParser10 extends SPARQLParser10Base implements SPARQLParser10Constants { boolean allowAggregatesInExpressions = false ; final public void QueryUnit() throws ParseException { diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java index a99a98aefa3..a6d961fde9d 100644 --- a/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java +++ b/jena-arq/src/main/java/org/apache/jena/sparql/lang/sparql_11/SPARQLParser11.java @@ -11,7 +11,7 @@ import org.apache.jena.sparql.modify.request.* ; @SuppressWarnings("all") -public class SPARQLParser11 extends SPARQLParser11Base { +public class SPARQLParser11 extends SPARQLParser11Base implements SPARQLParser11Constants { boolean allowAggregatesInExpressions = false ; final public void QueryUnit() throws ParseException { From c140dd09722d6b08c55199ad8dc4d77c5feae42b Mon Sep 17 00:00:00 2001 From: ajs6f Date: Mon, 11 May 2015 15:05:05 -0400 Subject: [PATCH 3/3] Reseting Thrift autogenerated code --- .../apache/jena/riot/thrift/wire/RDF_ANY.java | 24 +++++++++++---- .../jena/riot/thrift/wire/RDF_BNode.java | 18 ++++++++++-- .../jena/riot/thrift/wire/RDF_DataTuple.java | 17 ++++++++--- .../jena/riot/thrift/wire/RDF_Decimal.java | 19 +++++++++--- .../apache/jena/riot/thrift/wire/RDF_IRI.java | 18 ++++++++++-- .../jena/riot/thrift/wire/RDF_Literal.java | 17 +++++++++-- .../jena/riot/thrift/wire/RDF_PrefixDecl.java | 18 ++++++++++-- .../jena/riot/thrift/wire/RDF_PrefixName.java | 18 ++++++++++-- .../jena/riot/thrift/wire/RDF_Quad.java | 17 +++++++++-- .../jena/riot/thrift/wire/RDF_REPEAT.java | 24 +++++++++++---- .../jena/riot/thrift/wire/RDF_StreamRow.java | 19 +++++++++++- .../jena/riot/thrift/wire/RDF_Term.java | 19 +++++++++++- .../jena/riot/thrift/wire/RDF_Triple.java | 29 ++++++++++++++----- .../jena/riot/thrift/wire/RDF_UNDEF.java | 23 +++++++++++---- .../apache/jena/riot/thrift/wire/RDF_VAR.java | 21 +++++++++++--- .../jena/riot/thrift/wire/RDF_VarTuple.java | 20 +++++++++---- 16 files changed, 259 insertions(+), 62 deletions(-) diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java index b1303461da6..5e65a807cf8 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_ANY.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_ANY implements org.apache.thrift.TBase, Cloneable { +public class RDF_ANY implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_ANY"); @@ -158,7 +170,7 @@ public int compareTo(RDF_ANY other) { } int lastComparison = 0; - RDF_ANY typedOther = other; + RDF_ANY typedOther = (RDF_ANY)other; return 0; } @@ -184,7 +196,7 @@ public String toString() { return sb.toString(); } - public void validate() { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } @@ -197,7 +209,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -253,12 +265,12 @@ public RDF_ANYTupleScheme getScheme() { private static class RDF_ANYTupleScheme extends TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) { + public void write(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) { + public void read(org.apache.thrift.protocol.TProtocol prot, RDF_ANY struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java index c4a6692b046..ed94718f89c 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_BNode.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_BNode implements org.apache.thrift.TBase, Cloneable { +public class RDF_BNode implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_BNode"); private static final org.apache.thrift.protocol.TField LABEL_FIELD_DESC = new org.apache.thrift.protocol.TField("label", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -223,7 +235,7 @@ public int compareTo(RDF_BNode other) { } int lastComparison = 0; - RDF_BNode typedOther = other; + RDF_BNode typedOther = (RDF_BNode)other; lastComparison = Boolean.valueOf(isSetLabel()).compareTo(typedOther.isSetLabel()); if (lastComparison != 0) { @@ -282,7 +294,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java index b9a4ff08362..536d6607108 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_DataTuple.java @@ -12,17 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_DataTuple implements org.apache.thrift.TBase, Cloneable { +public class RDF_DataTuple implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_DataTuple"); private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -246,7 +255,7 @@ public int compareTo(RDF_DataTuple other) { } int lastComparison = 0; - RDF_DataTuple typedOther = other; + RDF_DataTuple typedOther = (RDF_DataTuple)other; lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow()); if (lastComparison != 0) { @@ -289,7 +298,7 @@ public String toString() { return sb.toString(); } - public void validate() { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } @@ -302,7 +311,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java index 27a3719e54f..e231c5c6722 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Decimal.java @@ -12,15 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Decimal implements org.apache.thrift.TBase, Cloneable { +public class RDF_Decimal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Decimal"); private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.I64, (short)1); @@ -285,7 +296,7 @@ public int compareTo(RDF_Decimal other) { } int lastComparison = 0; - RDF_Decimal typedOther = other; + RDF_Decimal typedOther = (RDF_Decimal)other; lastComparison = Boolean.valueOf(isSetValue()).compareTo(typedOther.isSetValue()); if (lastComparison != 0) { @@ -338,7 +349,7 @@ public String toString() { return sb.toString(); } - public void validate() { + public void validate() throws org.apache.thrift.TException { // check for required fields // alas, we cannot check 'value' because it's a primitive and you chose the non-beans generator. // alas, we cannot check 'scale' because it's a primitive and you chose the non-beans generator. @@ -353,7 +364,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor. __isset_bitfield = 0; diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java index 85ee02de0b7..57e4b345484 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_IRI.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_IRI implements org.apache.thrift.TBase, Cloneable { +public class RDF_IRI implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_IRI"); private static final org.apache.thrift.protocol.TField IRI_FIELD_DESC = new org.apache.thrift.protocol.TField("iri", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -223,7 +235,7 @@ public int compareTo(RDF_IRI other) { } int lastComparison = 0; - RDF_IRI typedOther = other; + RDF_IRI typedOther = (RDF_IRI)other; lastComparison = Boolean.valueOf(isSetIri()).compareTo(typedOther.isSetIri()); if (lastComparison != 0) { @@ -282,7 +294,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java index a9f443fc687..b104598d573 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Literal.java @@ -12,15 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Literal implements org.apache.thrift.TBase, Cloneable { +public class RDF_Literal implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Literal"); private static final org.apache.thrift.protocol.TField LEX_FIELD_DESC = new org.apache.thrift.protocol.TField("lex", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -396,7 +407,7 @@ public int compareTo(RDF_Literal other) { } int lastComparison = 0; - RDF_Literal typedOther = other; + RDF_Literal typedOther = (RDF_Literal)other; lastComparison = Boolean.valueOf(isSetLex()).compareTo(typedOther.isSetLex()); if (lastComparison != 0) { @@ -518,7 +529,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java index aa59a0692b4..0d77b48cb3b 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixDecl.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_PrefixDecl implements org.apache.thrift.TBase, Cloneable { +public class RDF_PrefixDecl implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_PrefixDecl"); private static final org.apache.thrift.protocol.TField PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("prefix", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -282,7 +294,7 @@ public int compareTo(RDF_PrefixDecl other) { } int lastComparison = 0; - RDF_PrefixDecl typedOther = other; + RDF_PrefixDecl typedOther = (RDF_PrefixDecl)other; lastComparison = Boolean.valueOf(isSetPrefix()).compareTo(typedOther.isSetPrefix()); if (lastComparison != 0) { @@ -362,7 +374,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java index 7aacef3fe04..2df8ee12f11 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_PrefixName.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_PrefixName implements org.apache.thrift.TBase, Cloneable { +public class RDF_PrefixName implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_PrefixName"); private static final org.apache.thrift.protocol.TField PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("prefix", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -282,7 +294,7 @@ public int compareTo(RDF_PrefixName other) { } int lastComparison = 0; - RDF_PrefixName typedOther = other; + RDF_PrefixName typedOther = (RDF_PrefixName)other; lastComparison = Boolean.valueOf(isSetPrefix()).compareTo(typedOther.isSetPrefix()); if (lastComparison != 0) { @@ -362,7 +374,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java index 13047c320cf..c9abce6ab88 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Quad.java @@ -12,15 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Quad implements org.apache.thrift.TBase, Cloneable { +public class RDF_Quad implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Quad"); private static final org.apache.thrift.protocol.TField S_FIELD_DESC = new org.apache.thrift.protocol.TField("S", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -400,7 +411,7 @@ public int compareTo(RDF_Quad other) { } int lastComparison = 0; - RDF_Quad typedOther = other; + RDF_Quad typedOther = (RDF_Quad)other; lastComparison = Boolean.valueOf(isSetS()).compareTo(typedOther.isSetS()); if (lastComparison != 0) { @@ -521,7 +532,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java index 48f9b9dfb45..f0757059ec6 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_REPEAT.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_REPEAT implements org.apache.thrift.TBase, Cloneable { +public class RDF_REPEAT implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_REPEAT"); @@ -158,7 +170,7 @@ public int compareTo(RDF_REPEAT other) { } int lastComparison = 0; - RDF_REPEAT typedOther = other; + RDF_REPEAT typedOther = (RDF_REPEAT)other; return 0; } @@ -184,7 +196,7 @@ public String toString() { return sb.toString(); } - public void validate() { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } @@ -197,7 +209,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -253,12 +265,12 @@ public RDF_REPEATTupleScheme getScheme() { private static class RDF_REPEATTupleScheme extends TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) { + public void write(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) { + public void read(org.apache.thrift.protocol.TProtocol prot, RDF_REPEAT struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java index d7bc8d3098e..2453b0426ae 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_StreamRow.java @@ -6,12 +6,29 @@ */ package org.apache.jena.riot.thrift.wire; +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class RDF_StreamRow extends org.apache.thrift.TUnion { @@ -390,7 +407,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java index eae32a89634..6fd9bad7648 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Term.java @@ -6,12 +6,29 @@ */ package org.apache.jena.riot.thrift.wire; +import org.apache.thrift.scheme.IScheme; +import org.apache.thrift.scheme.SchemeFactory; +import org.apache.thrift.scheme.StandardScheme; + +import org.apache.thrift.scheme.TupleScheme; +import org.apache.thrift.protocol.TTupleProtocol; import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") public class RDF_Term extends org.apache.thrift.TUnion { @@ -872,7 +889,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java index ef3e34aa05b..7a58bfa30cc 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_Triple.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_Triple implements org.apache.thrift.TBase, Cloneable { +public class RDF_Triple implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_Triple"); private static final org.apache.thrift.protocol.TField S_FIELD_DESC = new org.apache.thrift.protocol.TField("S", org.apache.thrift.protocol.TType.STRUCT, (short)1); @@ -341,33 +353,34 @@ public int compareTo(RDF_Triple other) { } int lastComparison = 0; + RDF_Triple typedOther = (RDF_Triple)other; - lastComparison = Boolean.valueOf(isSetS()).compareTo(other.isSetS()); + lastComparison = Boolean.valueOf(isSetS()).compareTo(typedOther.isSetS()); if (lastComparison != 0) { return lastComparison; } if (isSetS()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.S, other.S); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.S, typedOther.S); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetP()).compareTo(other.isSetP()); + lastComparison = Boolean.valueOf(isSetP()).compareTo(typedOther.isSetP()); if (lastComparison != 0) { return lastComparison; } if (isSetP()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.P, other.P); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.P, typedOther.P); if (lastComparison != 0) { return lastComparison; } } - lastComparison = Boolean.valueOf(isSetO()).compareTo(other.isSetO()); + lastComparison = Boolean.valueOf(isSetO()).compareTo(typedOther.isSetO()); if (lastComparison != 0) { return lastComparison; } if (isSetO()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.O, other.O); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.O, typedOther.O); if (lastComparison != 0) { return lastComparison; } @@ -441,7 +454,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java index 7f06678e07f..934ade4ca76 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_UNDEF.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_UNDEF implements org.apache.thrift.TBase, Cloneable { +public class RDF_UNDEF implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_UNDEF"); @@ -158,6 +170,7 @@ public int compareTo(RDF_UNDEF other) { } int lastComparison = 0; + RDF_UNDEF typedOther = (RDF_UNDEF)other; return 0; } @@ -183,7 +196,7 @@ public String toString() { return sb.toString(); } - public void validate() { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } @@ -196,7 +209,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { @@ -252,12 +265,12 @@ public RDF_UNDEFTupleScheme getScheme() { private static class RDF_UNDEFTupleScheme extends TupleScheme { @Override - public void write(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) { + public void write(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) throws org.apache.thrift.TException { TTupleProtocol oprot = (TTupleProtocol) prot; } @Override - public void read(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) { + public void read(org.apache.thrift.protocol.TProtocol prot, RDF_UNDEF struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; } } diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java index 61d56f04aa2..280f9d542da 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VAR.java @@ -12,14 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; +import java.util.List; +import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; +import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_VAR implements org.apache.thrift.TBase, Cloneable { +public class RDF_VAR implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_VAR"); private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1); @@ -223,13 +235,14 @@ public int compareTo(RDF_VAR other) { } int lastComparison = 0; + RDF_VAR typedOther = (RDF_VAR)other; - lastComparison = Boolean.valueOf(isSetName()).compareTo(other.isSetName()); + lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName()); if (lastComparison != 0) { return lastComparison; } if (isSetName()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, other.name); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.name, typedOther.name); if (lastComparison != 0) { return lastComparison; } @@ -281,7 +294,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) { diff --git a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java index ba7b8f6712e..0700e006559 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/thrift/wire/RDF_VarTuple.java @@ -12,17 +12,26 @@ import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; +import org.apache.thrift.protocol.TProtocolException; +import org.apache.thrift.EncodingUtils; +import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; +import java.util.Set; +import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; +import java.nio.ByteBuffer; +import java.util.Arrays; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @SuppressWarnings("all") -public class RDF_VarTuple implements org.apache.thrift.TBase, Cloneable { +public class RDF_VarTuple implements org.apache.thrift.TBase, java.io.Serializable, Cloneable { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RDF_VarTuple"); private static final org.apache.thrift.protocol.TField VARS_FIELD_DESC = new org.apache.thrift.protocol.TField("vars", org.apache.thrift.protocol.TType.LIST, (short)1); @@ -246,13 +255,14 @@ public int compareTo(RDF_VarTuple other) { } int lastComparison = 0; + RDF_VarTuple typedOther = (RDF_VarTuple)other; - lastComparison = Boolean.valueOf(isSetVars()).compareTo(other.isSetVars()); + lastComparison = Boolean.valueOf(isSetVars()).compareTo(typedOther.isSetVars()); if (lastComparison != 0) { return lastComparison; } if (isSetVars()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vars, other.vars); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.vars, typedOther.vars); if (lastComparison != 0) { return lastComparison; } @@ -288,7 +298,7 @@ public String toString() { return sb.toString(); } - public void validate() { + public void validate() throws org.apache.thrift.TException { // check for required fields // check for sub-struct validity } @@ -301,7 +311,7 @@ private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOExcept } } - private void readObject(java.io.ObjectInputStream in) throws java.io.IOException { + private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException { try { read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in))); } catch (org.apache.thrift.TException te) {