You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by cl...@apache.org on 2015/05/10 15:04:00 UTC
[31/50] [abbrv] jena git commit: Fix warnings after JENA-931
Fix warnings after JENA-931
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fa3bae84
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fa3bae84
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fa3bae84
Branch: refs/heads/add-contract-tests
Commit: fa3bae848ab63855900627d8745246a1170eff7d
Parents: d480bd1
Author: Andy Seaborne <an...@apache.org>
Authored: Wed May 6 19:40:10 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed May 6 19:40:10 2015 +0100
----------------------------------------------------------------------
.../apache/jena/sparql/engine/iterator/QueryIterGroup.java | 1 -
.../java/org/apache/jena/atlas/iterator/IteratorArray.java | 2 +-
.../main/java/org/apache/jena/atlas/lib/ActionKeyValue.java | 2 +-
.../src/main/java/org/apache/jena/atlas/lib/ListUtils.java | 2 +-
.../src/main/java/org/apache/jena/atlas/lib/StrUtils.java | 8 +++-----
.../org/apache/jena/atlas/iterator/TestIteratorArray.java | 3 +++
.../org/apache/jena/atlas/iterator/TestIteratorPeek.java | 6 ++----
.../jena/query/text/assembler/EntityDefinitionAssembler.java | 1 -
8 files changed, 11 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterGroup.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterGroup.java b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterGroup.java
index 2b2e194..6595533 100644
--- a/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterGroup.java
+++ b/jena-arq/src/main/java/org/apache/jena/sparql/engine/iterator/QueryIterGroup.java
@@ -26,7 +26,6 @@ import java.util.List ;
import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.atlas.iterator.IteratorDelayedInitialization ;
import org.apache.jena.atlas.lib.Pair ;
-import org.apache.jena.ext.com.google.common.collect.ArrayListMultimap;
import org.apache.jena.ext.com.google.common.collect.HashMultimap;
import org.apache.jena.ext.com.google.common.collect.Multimap;
import org.apache.jena.graph.Node ;
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
index 2c97ca7..c73a8f7 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/iterator/IteratorArray.java
@@ -24,7 +24,7 @@ import java.util.NoSuchElementException ;
/** Iterator over a Java base array */
/**
- * @deprecated
+ * @deprecated
* Prefer {@link Arrays#asList(Object...)} with {@link Iterable#iterator()} or
* {@link Arrays#spliterator(Object[])} or {@link Arrays#stream(Object[])}
*/
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-base/src/main/java/org/apache/jena/atlas/lib/ActionKeyValue.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/ActionKeyValue.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/ActionKeyValue.java
index 12dadab..3a51e64 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/ActionKeyValue.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/ActionKeyValue.java
@@ -21,7 +21,7 @@ package org.apache.jena.atlas.lib;
import java.util.function.BiConsumer;
/**
- * Prefer {@link BiConsumer<KeyType, ValueType>}.
+ * @drepecated Use {@link BiConsumer}.
*/
@Deprecated
public interface ActionKeyValue<KeyType, ValueType> extends BiConsumer<KeyType, ValueType>
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-base/src/main/java/org/apache/jena/atlas/lib/ListUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/ListUtils.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/ListUtils.java
index 2d1345f..470ea08 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/ListUtils.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/ListUtils.java
@@ -75,7 +75,7 @@ public class ListUtils
/** Return a list of lists of all the elements of collection in every order
* Easy to run out of heap memory.
*
- * See {@link com.google.common.collect.Collections2#permutations(Collection<E>)}
+ * See {@link org.apache.jena.ext.com.google.common.collect.Collections2#permutations}
*/
static public <T> List<List<T>> permute(List<T> c)
{
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-base/src/main/java/org/apache/jena/atlas/lib/StrUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/StrUtils.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/StrUtils.java
index a61af11..b0b4721 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/StrUtils.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/StrUtils.java
@@ -18,15 +18,13 @@
package org.apache.jena.atlas.lib;
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.joining;
-import static java.util.stream.Collectors.toList;
+import static java.util.Arrays.stream ;
+import static java.util.stream.Collectors.joining ;
+import static java.util.stream.Collectors.toList ;
import java.io.UnsupportedEncodingException ;
-import java.util.ArrayList ;
import java.util.List ;
import java.util.Map ;
-import java.util.stream.Collectors;
public class StrUtils //extends StringUtils
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java
index 5108865..f538558 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorArray.java
@@ -25,8 +25,11 @@ import org.apache.jena.atlas.iterator.IteratorArray ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.junit.Test ;
+// Legacy - to be removed sometime.
+@SuppressWarnings("deprecation")
public class TestIteratorArray extends BaseTest
{
+
IteratorArray<String> create(String ... a)
{
return IteratorArray.create(a) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
index 33f0b70..01581d6 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
@@ -21,10 +21,8 @@ package org.apache.jena.atlas.iterator;
import java.util.ArrayList ;
import java.util.List ;
-import org.apache.jena.atlas.iterator.Iter ;
-import org.apache.jena.atlas.iterator.IteratorArray ;
-import org.apache.jena.atlas.iterator.PeekIterator ;
import org.apache.jena.atlas.junit.BaseTest ;
+import org.apache.jena.ext.com.google.common.collect.Iterators ;
import org.junit.Test ;
public class TestIteratorPeek extends BaseTest
@@ -61,7 +59,7 @@ public class TestIteratorPeek extends BaseTest
private static PeekIterator<String> create(String...a)
{
- return new PeekIterator<>(IteratorArray.create(a)) ;
+ return new PeekIterator<>(Iterators.forArray(a)) ;
}
@Test public void peek_1()
http://git-wip-us.apache.org/repos/asf/jena/blob/fa3bae84/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
----------------------------------------------------------------------
diff --git a/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java b/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
index a54fc92..ca66f27 100644
--- a/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
+++ b/jena-text/src/main/java/org/apache/jena/query/text/assembler/EntityDefinitionAssembler.java
@@ -32,7 +32,6 @@ import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.ext.com.google.common.collect.HashMultimap;
import org.apache.jena.ext.com.google.common.collect.Multimap;
-import org.apache.jena.ext.com.google.common.collect.Multimaps;
import org.apache.jena.graph.Node ;
import org.apache.jena.query.* ;
import org.apache.jena.query.text.EntityDefinition ;