You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by aj...@apache.org on 2017/01/13 19:41:57 UTC

[3/9] jena git commit: Cleaning Set utility functions, removing haphazardly-used DS utility in favor of library methods and ordinary constructors

Cleaning Set utility functions, removing haphazardly-used DS utility in favor of library  methods and ordinary constructors


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/0648dc31
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/0648dc31
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/0648dc31

Branch: refs/heads/master
Commit: 0648dc311be962c13b4ffbd8b933432897debd32
Parents: d91d9d3
Author: ajs6f <aj...@virginia.edu>
Authored: Fri Jan 6 21:48:25 2017 -0500
Committer: ajs6f <aj...@virginia.edu>
Committed: Wed Jan 11 11:49:24 2017 -0500

----------------------------------------------------------------------
 .../java/org/apache/jena/riot/RDFLanguages.java |  8 ++--
 .../org/apache/jena/riot/RDFParserRegistry.java | 11 ++---
 .../jena/sparql/algebra/OpVisitorBase.java      |  2 +-
 .../optimize/TransformFilterPlacement.java      | 16 +++----
 .../apache/jena/sparql/engine/join/Join.java    |  6 +--
 .../apache/jena/sparql/engine/join/JoinKey.java | 14 +++---
 .../iterator/AbstractTestDistinctReduced.java   |  4 +-
 .../jena/atlas/iterator/IteratorConcat.java     |  5 +--
 .../main/java/org/apache/jena/atlas/lib/DS.java | 45 --------------------
 .../org/apache/jena/atlas/lib/SetUtils.java     | 28 +++++++++---
 .../apache/jena/fuseki/server/FusekiServer.java |  3 +-
 11 files changed, 55 insertions(+), 87 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
index 0ab7d6f..b3ad386 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
@@ -22,10 +22,10 @@ import static org.apache.jena.riot.WebContent.* ;
 
 import java.util.Collection ;
 import java.util.Collections ;
+import java.util.HashMap;
 import java.util.Locale ;
 import java.util.Map ;
 
-import org.apache.jena.atlas.lib.DS ;
 import org.apache.jena.atlas.logging.Log ;
 import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.atlas.web.MediaType ;
@@ -153,16 +153,16 @@ public class RDFLanguages
     // ---- Central registry
     
     /** Mapping of colloquial name to language */
-    private static Map<String, Lang> mapLabelToLang                    = DS.map() ;
+    private static Map<String, Lang> mapLabelToLang                    = new HashMap<>() ;
     
     // For testing mainly.
     public static Collection<Lang> getRegisteredLanguages()     { return Collections.unmodifiableCollection(mapLabelToLang.values()); }
     
     /** Mapping of content type (main and alternatives) to language */  
-    private static Map<String, Lang> mapContentTypeToLang              = DS.map() ;
+    private static Map<String, Lang> mapContentTypeToLang              = new HashMap<>() ;
 
     /** Mapping of file extension to language */
-    private static Map<String, Lang> mapFileExtToLang                  = DS.map() ;
+    private static Map<String, Lang> mapFileExtToLang                  = new HashMap<>() ;
 
     // ----------------------
     public static void init() {}

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
index 65a5956..7dcea04 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParserRegistry.java
@@ -22,10 +22,11 @@ import static org.apache.jena.riot.RDFLanguages.* ;
 
 import java.io.InputStream ;
 import java.io.Reader ;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Map ;
 import java.util.Set ;
 
-import org.apache.jena.atlas.lib.DS ;
 import org.apache.jena.atlas.lib.InternalErrorException ;
 import org.apache.jena.atlas.web.ContentType ;
 import org.apache.jena.riot.lang.* ;
@@ -47,16 +48,16 @@ import org.apache.jena.sparql.util.Context ;
 public class RDFParserRegistry
 {
     /** Map Jena I/O names to language */
-    private static Map<String, Lang> mapJenaNameToLang                 = DS.map() ;
+    private static Map<String, Lang> mapJenaNameToLang                 = new HashMap<>() ;
 
     /** map language to a parser factory */ 
-    private static Map<Lang, ReaderRIOTFactory> langToParserFactory  = DS.map() ;
+    private static Map<Lang, ReaderRIOTFactory> langToParserFactory  = new HashMap<>() ;
     
     /** Known triples languages */
-    private static Set<Lang> langTriples  = DS.set() ;
+    private static Set<Lang> langTriples  = new HashSet<>() ;
 
     /** Known quads languages */
-    private static Set<Lang> langQuads    = DS.set() ;
+    private static Set<Lang> langQuads    = new HashSet<>() ;
 
     /** Generic parser factory. */
     private static ReaderRIOTFactory parserFactory          = new ReaderRIOTFactoryImpl() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java
index 14fe7c0..9c1e750 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/OpVisitorBase.java
@@ -93,4 +93,4 @@ public class OpVisitorBase implements OpVisitor
     @Override public void visit(OpGroup opGroup)                {}
     
     @Override public void visit(OpTopN opTop)                   {}
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
index 0b8b02d..59dff2a 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/algebra/optimize/TransformFilterPlacement.java
@@ -20,9 +20,7 @@ package org.apache.jena.sparql.algebra.optimize ;
 
 import java.util.* ;
 
-import org.apache.jena.atlas.lib.DS ;
 import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.lib.SetUtils ;
 import org.apache.jena.graph.Node ;
 import org.apache.jena.graph.Triple ;
 import org.apache.jena.sparql.algebra.Op ;
@@ -282,7 +280,7 @@ public class TransformFilterPlacement extends TransformCopy {
     
     private static Placement placeBGP(ExprList exprsIn, BasicPattern pattern) {
         ExprList exprs = ExprList.copy(exprsIn) ;
-        Set<Var> patternVarsScope = DS.set() ;
+        Set<Var> patternVarsScope = new HashSet<>() ;
         // Any filters that depend on no variables.
         Op op = insertAnyFilter$(exprs, patternVarsScope, null) ;
 
@@ -308,7 +306,7 @@ public class TransformFilterPlacement extends TransformCopy {
      * but do not break up the BasicPattern in any way.
      */
     private Placement wrapBGP(ExprList exprsIn, BasicPattern pattern) {
-        Set<Var> vs = DS.set();
+        Set<Var> vs = new HashSet<>();
         VarUtils.addVars(vs, pattern);
         ExprList pushed = new ExprList();
         ExprList unpushed = new ExprList();
@@ -362,7 +360,7 @@ public class TransformFilterPlacement extends TransformCopy {
     
     private static Placement placeQuadPattern(ExprList exprsIn, Node graphNode, BasicPattern pattern) {
         ExprList exprs = ExprList.copy(exprsIn) ;
-        Set<Var> patternVarsScope = DS.set() ;
+        Set<Var> patternVarsScope = new HashSet<>() ;
         // Any filters that depend on no variables.
         Op op = insertAnyFilter$(exprs, patternVarsScope, null) ;
 
@@ -390,7 +388,7 @@ public class TransformFilterPlacement extends TransformCopy {
      *  but do not break up the BasicPattern in any way.
      */
     private static Placement wrapQuadPattern(ExprList exprsIn, Node graphNode, BasicPattern pattern) {
-        Set<Var> vs = DS.set();
+        Set<Var> vs = new HashSet<>();
         VarUtils.addVars(vs, pattern);
         if (Var.isVar(graphNode)) 
             vs.add(Var.alloc(graphNode));
@@ -432,14 +430,14 @@ public class TransformFilterPlacement extends TransformCopy {
     }
 
     private Placement placePropertyFunction(ExprList exprsIn, OpPropFunc input) {
-        Set<Var> argVars = DS.set() ;
+        Set<Var> argVars = new HashSet<>() ;
         PropFuncArg.addVars(argVars, input.getSubjectArgs()) ;
         PropFuncArg.addVars(argVars, input.getObjectArgs()) ;
         return placePropertyFunctionProcedure(exprsIn, argVars, input) ;
     }
 
     private Placement placeProcedure(ExprList exprsIn, OpProcedure input) {
-        Set<Var> argVars = DS.set() ;
+        Set<Var> argVars = new HashSet<>() ;
         input.getArgs().varsMentioned(argVars);
         return placePropertyFunctionProcedure(exprsIn, argVars, input) ;
     }
@@ -479,7 +477,7 @@ public class TransformFilterPlacement extends TransformCopy {
      */
     private Placement placeSequence(ExprList exprsIn, OpSequence opSequence) {
         ExprList exprs = ExprList.copy(exprsIn) ;
-        Set<Var> varScope = DS.set() ;
+        Set<Var> varScope = new HashSet<>() ;
         List<Op> ops = opSequence.getElements() ;
 
         Op op = null ;

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
index 867666f..3044a86 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/Join.java
@@ -18,10 +18,10 @@
 
 package org.apache.jena.sparql.engine.join;
 
+import java.util.ArrayList;
 import java.util.List ;
 
 import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.lib.DS ;
 import org.apache.jena.sparql.algebra.Algebra ;
 import org.apache.jena.sparql.algebra.Table ;
 import org.apache.jena.sparql.algebra.TableFactory ;
@@ -165,7 +165,7 @@ public class Join {
      */
     public static QueryIterator nestedLoopJoinBasic(QueryIterator left, QueryIterator right, ExecutionContext execCxt) {
         List<Binding> leftRows = Iter.toList(left) ;
-        List<Binding> output = DS.list() ;
+        List<Binding> output = new ArrayList<>() ;
         for ( ; right.hasNext() ; ) {
             Binding row2 = right.next() ;
             for ( Binding row1 : leftRows ) {
@@ -184,7 +184,7 @@ public class Join {
     public static QueryIterator nestedLoopLeftJoinBasic(QueryIterator left, QueryIterator right, ExprList conditions, ExecutionContext execCxt) {
         // Stream from left, materialize right.
         List<Binding> rightRows = Iter.toList(right) ;
-        List<Binding> output = DS.list() ;
+        List<Binding> output = new ArrayList<>() ;
         long count = 0 ;
         for ( ; left.hasNext() ; ) {
             Binding row1 = left.next() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/JoinKey.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/JoinKey.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/JoinKey.java
index ea24927..81241be 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/JoinKey.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/join/JoinKey.java
@@ -17,24 +17,24 @@
  */
 
 package org.apache.jena.sparql.engine.join;
+import java.util.ArrayList;
 import java.util.Collection ;
+import java.util.Collections;
 import java.util.Iterator ;
 import java.util.List ;
 
-import org.apache.jena.atlas.lib.DS ;
-
 import org.apache.jena.sparql.core.Var ;
 
 /** JoinKey for hash joins */
 public final class JoinKey implements Iterable<Var>
 {
     /** Key of no variables */
-    private static final JoinKey emptyKey = new JoinKey(DS.listOfNone()) ;
+    private static final JoinKey emptyKey = new JoinKey(Collections.emptyList()) ;
 
     /** Make a JoinKey from the intersection of two sets **/  
     public static JoinKey create(Collection<Var> vars1, Collection<Var> vars2) {
         // JoinKeys and choices for keys are generally small so short loops are best.
-        List<Var> intersection = DS.list() ;
+        List<Var> intersection = new ArrayList<>() ;
         for ( Var v : vars1 ) {
             if ( vars2.contains(v) )
                 intersection.add(v) ;  
@@ -59,7 +59,7 @@ public final class JoinKey implements Iterable<Var>
      * and it can be continued to be used.
      */
     public static final class Builder {
-        private List<Var> keys = DS.list() ;
+        private List<Var> keys = new ArrayList<>() ;
         
         public Builder() { }
         
@@ -82,7 +82,7 @@ public final class JoinKey implements Iterable<Var>
         public Builder clear()      { keys.clear() ; return this ; }
 
         public JoinKey build() {
-            JoinKey joinKey = new JoinKey(DS.list(keys)) ; 
+            JoinKey joinKey = new JoinKey(new ArrayList<>(keys)) ; 
             return joinKey ;
         }
     }
@@ -92,7 +92,7 @@ public final class JoinKey implements Iterable<Var>
     
     private JoinKey(List<Var> _keys) { keys = _keys ; }
     
-    private JoinKey(Var var)        { keys = DS.listOfOne(var) ; }
+    private JoinKey(Var var)        { keys = Collections.singletonList(var) ; }
     
     public boolean isEmpty()        { return keys.isEmpty() ; }
     

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/AbstractTestDistinctReduced.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/AbstractTestDistinctReduced.java b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/AbstractTestDistinctReduced.java
index ac37b63..e830ab5 100644
--- a/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/AbstractTestDistinctReduced.java
+++ b/jena-arq/src/test/java/org/apache/jena/sparql/engine/iterator/AbstractTestDistinctReduced.java
@@ -18,6 +18,7 @@
 
 package org.apache.jena.sparql.engine.iterator;
 
+import java.util.ArrayList;
 import java.util.Arrays ;
 import java.util.HashSet ;
 import java.util.List ;
@@ -26,7 +27,6 @@ import java.util.stream.Collectors ;
 
 import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.junit.BaseTest ;
-import org.apache.jena.atlas.lib.DS ;
 import org.apache.jena.graph.NodeFactory ;
 import org.apache.jena.sparql.core.Var ;
 import org.apache.jena.sparql.engine.QueryIterator ;
@@ -56,7 +56,7 @@ public abstract class AbstractTestDistinctReduced extends BaseTest {
     protected abstract QueryIterator createQueryIter(List<Binding> data) ;
     
     @Test public void distinct0() {
-        distinct(DS.list(), DS.list()) ;
+        distinct(new ArrayList<>(), new ArrayList<>()) ;
     }
 
     @Test public void distinct1() {

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
index 65e6430..54cd781 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorConcat.java
@@ -18,12 +18,11 @@
 
 package org.apache.jena.atlas.iterator;
 
+import java.util.ArrayList;
 import java.util.Iterator ;
 import java.util.List ;
 import java.util.NoSuchElementException ;
 
-import org.apache.jena.atlas.lib.DS ;
-
 /** Iterator of Iterators
  *  IteratorConcat is better when there are lots of iterators to be joined.
  *  IteratorCons is slightly better for two iterators. 
@@ -31,7 +30,7 @@ import org.apache.jena.atlas.lib.DS ;
 
 public class IteratorConcat<T> implements Iterator<T>
 {
-    private List<Iterator<T>> iterators = DS.list(); 
+    private List<Iterator<T>> iterators = new ArrayList<>(); 
     int idx = -1 ;
     private Iterator<T> current = null ;
     private Iterator<T> removeFrom = null ;

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-base/src/main/java/org/apache/jena/atlas/lib/DS.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/DS.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/DS.java
deleted file mode 100644
index f9c7095..0000000
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/DS.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.atlas.lib;
-
-
-import java.util.* ;
-
-public class DS
-{
-    private DS() {}
- 
-    public static <X> Set<X> setOfNone()            { return Collections.emptySet()  ; }
-    public static <X> Set<X> setOfOne(X element)    { return Collections.singleton(element) ; }
-    public static <X> Set<X> set()                  { return new HashSet<>(); }
-    public static <X> Set<X> set(int initialSize)   { return new HashSet<>(initialSize); }
-    public static <X> Set<X> set(Set<X> other)      { return new HashSet<>(other); }
-
-    public static <K, V> Map<K,V> mapOfNone()       { return Collections.emptyMap() ; }
-    public static <K, V> Map<K,V> mapOfOne(K key, V value) { return Collections.singletonMap(key, value) ; }
-    public static <K, V> Map<K,V> map()             { return new HashMap<>(); }
-    public static <K, V> Map<K,V> map(int initialSize) { return new HashMap<>(initialSize); }
-    public static <K, V> Map<K,V> map(Map<K,V> other) { return new HashMap<>(other); }
-
-    public static <T> List<T> listOfNone()          { return Collections.emptyList() ; }
-    public static <T> List<T> listOfOne(T element)  { return Collections.singletonList(element) ; }
-    public static <T> List<T> list()                { return new ArrayList<>(); }
-    public static <T> List<T> list(int initialSize) { return new ArrayList<>(initialSize); }
-    public static <T> List<T> list(List<T> other)   { return new ArrayList<>(other); }
-}

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
index fb3b2ca..f859943 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/SetUtils.java
@@ -31,9 +31,7 @@ public class SetUtils
     public static final <X> Set<X> concurrentHashSet() {
         return ConcurrentHashMap.newKeySet() ;
     }
-    
-    public static <X> Set<X> setOfOne(X element) { return DS.setOfOne(element) ; }
-    
+
     public static <T> Set<T> intersection(Set<? extends T> setLeft, Set<? extends T> setRight) {
         Set<T> results = new HashSet<>(setLeft) ;
         results.retainAll(setRight) ;
@@ -44,13 +42,26 @@ public class SetUtils
         return s1.stream().anyMatch(s2::contains) ;
     }
 
+    /**
+     * @param s1 a {@link Set}
+     * @param s2 a {@link Set}
+     * @return the eager set-theoretic union of {@code s1} and {@code s2}
+     * 
+     * @see org.apache.jena.ext.com.google.common.collect.Sets#union(Set, Set) for a lazy alternative
+     */
     public static <T> Set<T> union(Set<? extends T> s1, Set<? extends T> s2) {
         Set<T> s3 = new HashSet<>(s1) ;
         s3.addAll(s2) ;
         return s3 ;
     }
 
-    /** union difference intersection : those elements in s1 or s2 but not both. */
+    /**
+     * @param s1 a {@link Set}
+     * @param s2 a {@link Set}
+     * @return eager union difference intersection : those elements in {@code s1} or {@code s2} but not both
+     * 
+     * @see org.apache.jena.ext.com.google.common.collect.Sets#symmetricDifference(Set, Set) for a lazy alternative
+     */
     public static <T> Set<T> symmetricDifference(Set<? extends T> s1, Set<? extends T> s2) {
         Set<T> s3 = new HashSet<>() ;
         s1.forEach(x -> {
@@ -64,8 +75,13 @@ public class SetUtils
         return s3 ;
     }
 
-    /** Return is s1 \ s2 */
-
+    /**
+     * @param s1 a {@link Set}
+     * @param s2 a {@link Set}
+     * @return eager {@code s1} \ {@code s2}
+     * 
+     * @see org.apache.jena.ext.com.google.common.collect.Sets#difference(Set, Set) for a lazy alternative
+     */
     public static <T> Set<T> difference(Set<? extends T> s1, Set<? extends T> s2) {
         Set<T> s3 = new HashSet<>(s1) ;
         s3.removeAll(s2) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/0648dc31/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
index 6575527..b9a12ab 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
@@ -30,7 +30,6 @@ import java.util.* ;
 
 import jena.cmd.CmdException ;
 import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.atlas.lib.DS ;
 import org.apache.jena.atlas.lib.FileOps ;
 import org.apache.jena.atlas.lib.InternalErrorException ;
 import org.apache.jena.fuseki.Fuseki ;
@@ -225,7 +224,7 @@ public class FusekiServer
         // when processing a config file.
         // Compatibility.
         
-        List<DataAccessPoint> datasets = DS.list() ;
+        List<DataAccessPoint> datasets = new ArrayList<>();
         if ( params == null )
             return datasets ;