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/23 12:48:24 UTC
svn commit: r1604737 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/atlas/lib/ main/java/org/apache/jena/atlas/web/
main/java/org/apache/jena/riot/web/ test/java/com/hp/hpl/jena/sparql/graph/
Author: andy
Date: Mon Jun 23 10:48:23 2014
New Revision: 1604737
URL: http://svn.apache.org/r1604737
Log:
TypedInputStream.close to convert exceptions to Atlas IO Exceptions.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java?rev=1604737&r1=1604736&r2=1604737&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/MultiMap.java Mon Jun 23 10:48:23 2014
@@ -48,7 +48,7 @@ public abstract class MultiMap<K, V>
return c.iterator().next() ;
}
- public void putAll(K key, @SuppressWarnings("unchecked") V ... values)
+ public void putAll(K key, V ... values)
{
for ( V v : values)
put(key, v) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java?rev=1604737&r1=1604736&r2=1604737&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/Tuple.java Mon Jun 23 10:48:23 2014
@@ -30,7 +30,7 @@ import org.apache.jena.atlas.iterator.Tr
public class Tuple<T> implements Iterable<T> {
// Interface this?
// Classes: TupleImpl, TupleSlice
- public static <X> Tuple<X> createTuple(@SuppressWarnings("unchecked") X... elements) {
+ public static <X> Tuple<X> createTuple(X... elements) {
X[] els = elements ; // ArrayUtils.copy(elements) ;
return create(els) ;
}
@@ -70,7 +70,7 @@ public class Tuple<T> implements Iterabl
protected final T[] tuple ;
- protected Tuple(@SuppressWarnings("unchecked") T... tuple) {
+ protected Tuple(T... tuple) {
this.tuple = tuple ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java?rev=1604737&r1=1604736&r2=1604737&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/web/TypedInputStream.java Mon Jun 23 10:48:23 2014
@@ -19,8 +19,11 @@
package org.apache.jena.atlas.web;
import java.io.FilterInputStream ;
+import java.io.IOException ;
import java.io.InputStream ;
+import org.apache.jena.atlas.io.IO ;
+
public class TypedInputStream extends FilterInputStream
{
private ContentType mediaType ;
@@ -55,4 +58,10 @@ public class TypedInputStream extends Fi
public String getCharset() { return mediaType == null ? null : mediaType.getCharset() ; }
public ContentType getMediaType() { return mediaType ; }
public String getBaseURI() { return baseURI ; }
-}
+
+ @Override
+ public void close() {
+ try { super.close() ; }
+ catch (IOException ex) { IO.exception(ex) ; }
+ }
+}
\ No newline at end of file
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java?rev=1604737&r1=1604736&r2=1604737&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/web/TypedInputStreamHttp.java Mon Jun 23 10:48:23 2014
@@ -18,7 +18,6 @@
package org.apache.jena.riot.web;
-import java.io.IOException ;
import java.io.InputStream ;
import org.apache.http.conn.ClientConnectionManager ;
@@ -42,7 +41,7 @@ public class TypedInputStreamHttp extend
}
@Override
- public void close() throws IOException
+ public void close()
{
super.close() ;
if ( connectMgr != null )
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java?rev=1604737&r1=1604736&r2=1604737&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/graph/TestGraphUnionRead.java Mon Jun 23 10:48:23 2014
@@ -115,17 +115,8 @@ public class TestGraphUnionRead extends
assertEquals(2, x) ;
}
- static <T> List<T> list(@SuppressWarnings("unchecked") T...x)
+ static <T> List<T> list(T...x)
{
- // Warning: "Potential heap pollution via varargs parameter x"
- // Presumably because x is passed into a method.
return Arrays.asList(x) ;
-
- // Avoid warning - copy.
-// List<T> array = new ArrayList<T>(x.length) ;
-// for ( T t : x )
-// array.add(t) ;
-// return array ;
-
}
}