Repository: jena Updated Branches: refs/heads/master 7de95193d -> ce39286ad
Fix - copy altPrefixes to altPrefixes Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/ce39286a Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/ce39286a Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/ce39286a Branch: refs/heads/master Commit: ce39286adefb8d5446fc78abea8656d1d9233de2 Parents: 7de9519 Author: Andy Seaborne <[email protected]> Authored: Sat Apr 29 10:30:29 2017 +0100 Committer: Andy Seaborne <[email protected]> Committed: Sat Apr 29 10:30:29 2017 +0100 ---------------------------------------------------------------------- .../jena/riot/adapters/AdapterFileManager.java | 3 +- .../apache/jena/riot/adapters/AdapterLib.java | 51 ++++++++------------ 2 files changed, 20 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/ce39286a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java index d011328..a67a3bf 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterFileManager.java @@ -74,7 +74,7 @@ import org.slf4j.LoggerFactory ; public class AdapterFileManager extends org.apache.jena.util.FileManager { - // This is a legacy class - it provides FileManager calls onto the RIOT equivalents. + // This is a legacy class - it provides FileManager calls onto the RIOT equivalents. // The different aspects are now split out // and this class maintains the old interface. // Aspects: StreamManager, LocationMapper, Model cache. @@ -129,7 +129,6 @@ public class AdapterFileManager extends org.apache.jena.util.FileManager StreamManager sm = streamManager.clone() ; AdapterFileManager x = new AdapterFileManager(sm) ; return x ; - } public AdapterFileManager(StreamManager streamManager) { http://git-wip-us.apache.org/repos/asf/jena/blob/ce39286a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java ---------------------------------------------------------------------- diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java index 19594d5..90e1bad 100644 --- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java +++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLib.java @@ -16,56 +16,43 @@ * limitations under the License. */ -package org.apache.jena.riot.adapters ; +package org.apache.jena.riot.adapters; -import java.util.Iterator ; - -import org.apache.jena.atlas.lib.Lib ; -import org.apache.jena.atlas.web.TypedInputStream ; -import org.apache.jena.riot.RiotException ; -import org.apache.jena.riot.system.stream.* ; +import org.apache.jena.atlas.lib.Lib; +import org.apache.jena.atlas.web.TypedInputStream; +import org.apache.jena.riot.RiotException; +import org.apache.jena.riot.system.stream.*; class AdapterLib { public static org.apache.jena.util.TypedStream convert(TypedInputStream in) { - return new org.apache.jena.util.TypedStream(in, in.getContentType(), in.getCharset()) ; + return new org.apache.jena.util.TypedStream(in, in.getContentType(), in.getCharset()); } public static LocationMapper copyConvert(org.apache.jena.util.LocationMapper locMap) { - LocationMapper lmap2 = new LocationMapper() ; if ( locMap == null ) - return null ; - - Iterator<String> sIter1 = locMap.listAltEntries() ; - for (; sIter1.hasNext();) { - String k = sIter1.next() ; - lmap2.addAltEntry(k, locMap.getAltEntry(k)) ; - } - - Iterator<String> sIter2 = locMap.listAltPrefixes() ; - - for (; sIter2.hasNext();) { - String k = sIter2.next() ; - lmap2.addAltEntry(k, locMap.getAltPrefix(k)) ; - } - return lmap2 ; + return null; + LocationMapper lmap2 = new LocationMapper(); + locMap.listAltEntries().forEachRemaining(k->lmap2.addAltEntry(k, locMap.getAltEntry(k))); + locMap.listAltPrefixes().forEachRemaining(k->lmap2.addAltPrefix(k, locMap.getAltPrefix(k))); + return lmap2; } public static Locator convert(org.apache.jena.util.Locator oldloc) { if ( oldloc instanceof org.apache.jena.util.LocatorFile ) { - org.apache.jena.util.LocatorFile lFile = (org.apache.jena.util.LocatorFile)oldloc ; - return new LocatorFile(lFile.getDir()) ; + org.apache.jena.util.LocatorFile lFile = (org.apache.jena.util.LocatorFile)oldloc; + return new LocatorFile(lFile.getDir()); } if ( oldloc instanceof org.apache.jena.util.LocatorClassLoader ) { - org.apache.jena.util.LocatorClassLoader classLoc = (org.apache.jena.util.LocatorClassLoader)oldloc ; - return new LocatorClassLoader(classLoc.getClassLoader()) ; + org.apache.jena.util.LocatorClassLoader classLoc = (org.apache.jena.util.LocatorClassLoader)oldloc; + return new LocatorClassLoader(classLoc.getClassLoader()); } if ( oldloc instanceof org.apache.jena.util.LocatorURL ) - return new LocatorHTTP() ; + return new LocatorHTTP(); if ( oldloc instanceof org.apache.jena.util.LocatorZip ) { - org.apache.jena.util.LocatorZip zipLoc = (org.apache.jena.util.LocatorZip)oldloc ; - return new LocatorZip(zipLoc.getZipFileName()) ; + org.apache.jena.util.LocatorZip zipLoc = (org.apache.jena.util.LocatorZip)oldloc; + return new LocatorZip(zipLoc.getZipFileName()); } - throw new RiotException("Unrecognized Locator: " + Lib.className(oldloc)) ; + throw new RiotException("Unrecognized Locator: " + Lib.className(oldloc)); } }
