You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/06/21 19:39:26 UTC
svn commit: r1604439 - in /jena/trunk/jena-arq/src/main/java:
com/hp/hpl/jena/query/ com/hp/hpl/jena/sparql/algebra/
com/hp/hpl/jena/sparql/expr/ org/apache/jena/atlas/json/io/
org/apache/jena/riot/
Author: andy
Date: Sat Jun 21 17:39:25 2014
New Revision: 1604439
URL: http://svn.apache.org/r1604439
Log:
JENA-726 : More internal deprecated methods removed.
Modified:
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java
jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprNode.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java?rev=1604439&r1=1604438&r2=1604439&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/DatasetFactory.java Sat Jun 21 17:39:25 2014
@@ -22,14 +22,12 @@ import java.util.List ;
import com.hp.hpl.jena.assembler.Assembler ;
import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.ModelFactory ;
import com.hp.hpl.jena.rdf.model.Resource ;
import com.hp.hpl.jena.sparql.ARQException ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
import com.hp.hpl.jena.sparql.core.DatasetImpl ;
import com.hp.hpl.jena.sparql.core.assembler.DatasetAssembler ;
-import com.hp.hpl.jena.sparql.graph.GraphFactory ;
import com.hp.hpl.jena.sparql.util.DatasetUtils ;
import com.hp.hpl.jena.sparql.util.graph.GraphUtils ;
import com.hp.hpl.jena.util.FileManager ;
@@ -39,33 +37,28 @@ import com.hp.hpl.jena.util.FileManager
public class DatasetFactory
{
/** Create an in-memory, modifiable Dataset */
- public static Dataset createMem() { return create(DatasetGraphFactory.createMem()) ; }
+ public static Dataset createMem() { return create(DatasetGraphFactory.createMem()) ; }
/** Create an in-memory, modifiable Dataset.
* New graphs must be explicitly added using .addGraph.
*/
- public static Dataset createMemFixed() { return create(DatasetGraphFactory.createMemFixed()) ; }
+ public static Dataset createMemFixed() { return create(DatasetGraphFactory.createMemFixed()) ; }
/** Create an in-memory, modifyable Dataset
* @deprecated Use createMem
*/
@Deprecated
- public static Dataset create()
- {
- // This may not be a defaultJena model - during testing,
- // we use a graph that is not value-aware for xsd:String vs plain literals.
- return new DatasetImpl(ModelFactory.createModelForGraph(GraphFactory.createDefaultGraph())) ;
- }
+ public static Dataset create() { return createMem() ; }
/** Create a dataset with the given model as the default graph
- * @param model
+ * @param model The model for the default graph
* @return Dataset
*/
public static Dataset create(Model model)
{ return new DatasetImpl(model) ; }
- /** Create a dataset
- * @param dataset
+ /** Create a dataset: clone the dataset structure of named graohs, and share the graphs themselves.
+ * @param dataset Dataset to clone structure from.
* @return Dataset
*/
public static Dataset create(Dataset dataset)
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java?rev=1604439&r1=1604438&r2=1604439&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/query/ResultSetFactory.java Sat Jun 21 17:39:25 2014
@@ -441,21 +441,6 @@ public class ResultSetFactory {
}
/**
- * @deprecated This will be removed.
- * Sort an existing result set. Experimental. The list of variables is a
- * list of names (strings), with "x" for ascending in variable "x" and "-x"
- * for descending in variable "x"
- *
- * @param resultSet
- * @param conditions
- * @return ResultSet
- */
- @Deprecated
- static public ResultSet makeSorted(ResultSet resultSet, List<SortCondition> conditions) {
- return new SortedResultSet(resultSet, conditions);
- }
-
- /**
* Take a copy of a result set - the result set returns is an in-memory
* copy. It is not attached to the original query execution object which can
* be closed.
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java?rev=1604439&r1=1604438&r2=1604439&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/algebra/OpVars.java Sat Jun 21 17:39:25 2014
@@ -19,7 +19,6 @@
package com.hp.hpl.jena.sparql.algebra ;
import static com.hp.hpl.jena.sparql.core.Vars.addVar ;
-import static com.hp.hpl.jena.sparql.core.Vars.addVarsFromTriple ;
import java.util.* ;
@@ -107,23 +106,8 @@ public class OpVars
OpWalker.walk(op, visitor) ;
}
- /** @deprecated Use VarUtils.addVars */
- @Deprecated
- public static Collection<Var> vars(BasicPattern pattern) {
- Set<Var> acc = collector() ;
- vars(pattern, acc) ;
- return acc ;
- }
-
- /** @deprecated Use VarUtils.addVars */
- @Deprecated
- public static void vars(BasicPattern pattern, Collection<Var> acc) {
- for (Triple triple : pattern)
- addVarsFromTriple(acc, triple) ;
- }
-
/** Do project and don't walk into it. MINUS vars aren't visible either */
- private static class WalkerVisitorVisible extends WalkerVisitor
+ private static class WalkerVisitorVisible extends WalkerVisitor
{
private final Collection<Var> acc ;
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java?rev=1604439&r1=1604438&r2=1604439&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/Expr.java Sat Jun 21 17:39:25 2014
@@ -65,13 +65,6 @@ public interface Expr
/** Deep copy with substitution */
public Expr copySubstitute(Binding binding) ;
-
- /** Deep copy with substitution, possibly collapsing constant sub-expressions.
- * @deprecated See ExprTransformConstantFold for constant folding.
- */
- @Deprecated // To be removed.
- public Expr copySubstitute(Binding binding, boolean foldConstants) ;
-
/**
* Rewrite, applying a node->node transformation
*/
Modified: jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprNode.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprNode.java?rev=1604439&r1=1604438&r2=1604439&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprNode.java (original)
+++ jena/trunk/jena-arq/src/main/java/com/hp/hpl/jena/sparql/expr/ExprNode.java Sat Jun 21 17:39:25 2014
@@ -85,16 +85,6 @@ public abstract class ExprNode implement
public abstract Expr copySubstitute(Binding binding) ;
@Override
- @Deprecated
- final
- public Expr copySubstitute(Binding binding, boolean foldConstants) {
- Expr expr = copySubstitute(binding) ;
- if ( foldConstants )
- expr = ExprLib.foldConstants(expr) ;
- return expr ;
- }
-
- @Override
public abstract Expr applyNodeTransform(NodeTransform transform) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java?rev=1604439&r1=1604438&r2=1604439&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/json/io/JsonWriter.java Sat Jun 21 17:39:25 2014
@@ -18,7 +18,6 @@
package org.apache.jena.atlas.json.io;
-import java.io.OutputStream ;
import java.util.Set ;
import java.util.SortedSet ;
import java.util.TreeSet ;
@@ -28,11 +27,9 @@ import org.apache.jena.atlas.json.* ;
public class JsonWriter implements JsonVisitor
{
- IndentedWriter out ;
+ private final IndentedWriter out ;
public JsonWriter() { this(IndentedWriter.stdout) ; }
- @Deprecated
- public JsonWriter(OutputStream ps) { this(new IndentedWriter(ps)) ; }
public JsonWriter(IndentedWriter ps) { out = ps ; }
public void startOutput() { }
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java?rev=1604439&r1=1604438&r2=1604439&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/Lang.java Sat Jun 21 17:39:25 2014
@@ -168,47 +168,5 @@ public class Lang
return x ;
}
-
- // ----
- /** Translate a name into a Lang
- * Throws RiotException if the name is not recognized.
- * @deprecated Use {@link RDFLanguages#nameToLang(String)}
- */
- @Deprecated
- public static Lang get(String name) {
- Lang lang = RDFLanguages.nameToLang(name) ;
- if ( lang == null )
- throw new RiotException("No such language: "+name) ;
- return lang ;
- }
-
- /** Translate a name into a Lang, return the default if no match found.
- * @deprecated Use {@link RDFLanguages#nameToLang(String)}
- */
- @Deprecated
- public static Lang get(String name, Lang dftLang) {
- Lang lang = RDFLanguages.nameToLang(name) ;
- if ( lang == null )
- return dftLang ;
- return lang ;
- }
-
- /** Guess the language, based on filename, or URL, extenstion.
- * Returns default if there isn't a guess available
- * @deprecated Use {@link RDFLanguages#filenameToLang(String,Lang)}
- */
- @Deprecated
- public static Lang guess(String resourceIRI, Lang dftLang) {
- return RDFLanguages.filenameToLang(resourceIRI, dftLang) ;
- }
-
- /** Guess the language, based on filename, or URL, extenstion.
- * Returns null if there isn't a guess available
- * @deprecated Use {@link RDFLanguages#filenameToLang(String)}
- */
- @Deprecated
- public static Lang guess(String resourceIRI) {
- return RDFLanguages.filenameToLang(resourceIRI) ;
- }
}