JENA-1917: Deprecate jena-core Locators and LocationMapper
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
index 4beb530..e9318de 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFParser.java
@@ -375,7 +375,7 @@
}
TypedInputStream in;
- urlStr = StreamManager.get(context).mapURI(urlStr);
+ urlStr = streamManager.mapURI(urlStr);
if ( urlStr.startsWith("http://") || urlStr.startsWith("https://") ) {
// Need more control than LocatorURL provides. We could use it for the
// httpClient == null case.
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 e68e85d..ae056bf 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
@@ -125,7 +125,7 @@
instance = globalFileManager ;
}
- /** Create an uninitialized FileManager */
+ /** Create an uninitialized StreamManager */
private AdapterFileManager() {
streamManager = new StreamManager() ;
}
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 90e1bad..de32d02 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
@@ -37,6 +37,7 @@
return lmap2;
}
+ @SuppressWarnings("deprecation")
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;
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
index 4ecc2c7..0c753e2 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/adapters/AdapterLocationMapper.java
@@ -23,11 +23,13 @@
import org.apache.jena.rdf.model.Model ;
import org.apache.jena.riot.system.stream.LocationMapper ;
-/** Adapter from Jena2 LocationMapper to RIOT LocationMapper */
+/** Adapter from Jena core LocationMapper to RIOT LocationMapper */
+
public class AdapterLocationMapper extends org.apache.jena.util.LocationMapper
{
private final LocationMapper mapper ;
+ @SuppressWarnings("deprecation")
public AdapterLocationMapper(LocationMapper mapper) { this.mapper = mapper ; }
@Override
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
index f149d24..2553a5c 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/system/stream/StreamManager.java
@@ -37,8 +37,6 @@
*/
public class StreamManager {
- // Need to combine with IO to do the .gz and "-" things.
-
private static Logger log = LoggerFactory.getLogger(StreamManager.class) ;
public static boolean logAllLookups = true ;
@@ -48,28 +46,13 @@
private static StreamManager globalStreamManager ;
- public StreamManager() {}
-
- /** Create a deep copy of this StreamManager */
- @Override
- public StreamManager clone() {
- return clone(this) ;
- }
-
- private static StreamManager clone(StreamManager other) {
- StreamManager sm = new StreamManager() ;
- sm.handlers.addAll(other.handlers) ;
- sm.mapper = other.mapper == null ? null : other.mapper.clone() ;
- return sm ;
- }
-
/**
* Return a default configuration StreamManager with a {@link LocatorFile},
* {@link LocatorHTTP}, {@link LocatorFTP} and {@link LocatorClassLoader}
*/
- public static StreamManager makeDefaultStreamManager() {
+ public static StreamManager createStd() {
StreamManager streamManager = new StreamManager() ;
- streamManager.addLocator(new LocatorFile(null)) ;
+ streamManager.addLocator(new LocatorFile()) ;
streamManager.addLocator(new LocatorHTTP()) ;
streamManager.addLocator(new LocatorFTP()) ;
streamManager.addLocator(new LocatorClassLoader(streamManager.getClass().getClassLoader())) ;
@@ -77,6 +60,10 @@
return streamManager ;
}
+ /** @deprecate Use {@link #createStd()} */
+ @Deprecated
+ public static StreamManager makeDefaultStreamManager() { return createStd() ; }
+
/**
* Return the global {@code StreamManager}.
*/
@@ -111,7 +98,23 @@
globalStreamManager = streamManager ;
}
- static { setGlobal(makeDefaultStreamManager()) ; }
+ static { setGlobal(createStd()) ; }
+
+ /** Create a {@code StreamManager} with no locator or location mapper. */
+ public StreamManager() {}
+
+ /** Create a deep copy of this StreamManager */
+ @Override
+ public StreamManager clone() {
+ return clone(this) ;
+ }
+
+ private static StreamManager clone(StreamManager other) {
+ StreamManager sm = new StreamManager() ;
+ sm.handlers.addAll(other.handlers) ;
+ sm.mapper = other.mapper == null ? null : other.mapper.clone() ;
+ return sm ;
+ }
/**
* Open a file using the locators of this StreamManager.
@@ -190,7 +193,7 @@
return Collections.unmodifiableList(handlers) ;
}
- /** Remove a locator */
+ /** Remove a locator. */
public void remove(Locator loc) {
handlers.remove(loc) ;
}
@@ -200,8 +203,12 @@
handlers.clear() ;
}
- /** Add a locator to the end of the locators list */
- public void addLocator(Locator loc) {
+ /**
+ * Add a locator to the end of the locators list.
+ * Returns {@code this} StreamManager.
+ */
+ public StreamManager addLocator(Locator loc) {
handlers.add(loc) ;
+ return this;
}
}
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
index 74a9116..c5f6463 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/adapters/TestFileManager.java
@@ -35,6 +35,7 @@
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
+@SuppressWarnings("deprecation")
public class TestFileManager extends BaseTest
{
static Logger log = LoggerFactory.getLogger(TestFileManager.class) ;
@@ -192,7 +193,6 @@
assertNotSame(m1, m2) ;
}
- @SuppressWarnings("deprecation")
@Test public void testCache2() {
FileManager.setGlobalFileManager(AdapterFileManager.get()) ;
@@ -204,7 +204,6 @@
assertSame(m1, m2) ;
}
- @SuppressWarnings("deprecation")
@Test public void testCache3() {
FileManager fileManager = FileManager.getInternal() ;
fileManager.addLocatorFile(testingDir) ;
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java b/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java
index 40a1a4b..002097d 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/stream/TestLocationMapper.java
@@ -32,6 +32,7 @@
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
+@SuppressWarnings("deprecation")
public class TestLocationMapper
{
static Logger log = LoggerFactory.getLogger(TestLocationMapper.class) ;
@@ -39,9 +40,7 @@
static final String filename1 = "file:test" ;
static final String notFilename = "zzzz" ;
static final String filename2 = "file:"+testingDir+"/location-mapping-test-file" ;
- public static final String mapping = "location-mapping-test.ttl;"+
- testingDir+"/location-mapping-test.ttl" ;
-
+ public static final String mapping = "location-mapping-test.ttl;"+testingDir+"/location-mapping-test.ttl" ;
public TestLocationMapper() { }
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/FileManagerAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/FileManagerAssembler.java
index 8a54669..950f096 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/FileManagerAssembler.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/FileManagerAssembler.java
@@ -33,11 +33,13 @@
public Object open( Assembler a, Resource root, Mode irrelevant )
{
checkType( root, JA.FileManager );
+ @SuppressWarnings("deprecation")
FileManager fm = FileManager.createStd();
fm.setLocationMapper(getLocationMapper( a, root ) );
return fm;
}
+ @SuppressWarnings("deprecation")
private LocationMapper getLocationMapper( Assembler a, Resource root )
{
Resource lm = getUniqueResource( root, JA.locationMapper );
diff --git a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/LocationMapperAssembler.java b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/LocationMapperAssembler.java
index a7554f4..77c2425 100644
--- a/jena-core/src/main/java/org/apache/jena/assembler/assemblers/LocationMapperAssembler.java
+++ b/jena-core/src/main/java/org/apache/jena/assembler/assemblers/LocationMapperAssembler.java
@@ -28,6 +28,7 @@
*/
public class LocationMapperAssembler extends AssemblerBase
{
+ @SuppressWarnings("deprecation")
@Override
public Object open( Assembler a, Resource root, Mode irrelevant )
{
diff --git a/jena-core/src/main/java/org/apache/jena/util/FileManager.java b/jena-core/src/main/java/org/apache/jena/util/FileManager.java
index 79d7261..658bba2 100644
--- a/jena-core/src/main/java/org/apache/jena/util/FileManager.java
+++ b/jena-core/src/main/java/org/apache/jena/util/FileManager.java
@@ -33,7 +33,7 @@
/** For use within Jena libraries only. */
public static FileManager getInternal() { return FileManagerImpl.get(); }
- /** @deprecated Use {@code StreamManager} if needed; to read RDF files, use {@code RDFDataMgr}. */
+ /** @deprecated Use {@code RDFDataMgr} to read RDF files. Use {@code StreamManager} if needed. */
@Deprecated
public static FileManager get() { return getInternal(); }
@@ -41,9 +41,16 @@
@Deprecated
public static void setGlobalFileManager(FileManager fm) { FileManagerImpl.setGlobalFileManager(fm); }
+ /** @deprecated Use {@code StreamManager} */
+ @Deprecated
public static FileManager create() { return new FileManagerImpl(); }
+
+ /** @deprecated Use {@code StreamManager} */
+ @Deprecated
public static FileManager createStd() { return FileManagerImpl.makeStd(); }
+ /** @deprecated Use {@code StreamManager.} */
+ @Deprecated
public static FileManager create(LocationMapper locMap) { return new FileManagerImpl(locMap); }
FileManager clone();
diff --git a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java
index 418ba52..e4fab09 100644
--- a/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java
+++ b/jena-core/src/main/java/org/apache/jena/util/FileManagerImpl.java
@@ -120,6 +120,7 @@
public FileManager clone() { return clone(this) ; }
// Isolate to help avoid copy errors.
+ @SuppressWarnings("deprecation")
private static FileManager clone(FileManagerImpl filemanager) {
FileManagerImpl newFm = new FileManagerImpl() ;
newFm.fmHandlers.addAll(filemanager.fmHandlers) ;
@@ -134,7 +135,7 @@
/** Create a "standard" FileManager. */
public static FileManager makeGlobal()
{
- FileManagerImpl fMgr = new FileManagerImpl(LocationMapper.get()) ;
+ FileManagerImpl fMgr = new FileManagerImpl(LocationMapper.getInternal()) ;
setStdLocators(fMgr) ;
return fMgr ;
}
@@ -167,10 +168,12 @@
fmHandlers.add(loc) ; }
/** Add a file locator */
+ @Deprecated
@Override
public void addLocatorFile() { addLocatorFile(null) ; }
/** Add a file locator which uses dir as its working directory */
+ @Deprecated
@Override
public void addLocatorFile(String dir)
{
@@ -179,6 +182,7 @@
}
/** Add a class loader locator */
+ @Deprecated
@Override
public void addLocatorClassLoader(ClassLoader cLoad)
{
@@ -187,6 +191,7 @@
}
/** Add a URL locator */
+ @Deprecated
@Override
public void addLocatorURL()
{
@@ -195,6 +200,7 @@
}
/** Add a zip file locator */
+ @Deprecated
@Override
public void addLocatorZip(String zfn)
{
diff --git a/jena-core/src/main/java/org/apache/jena/util/LocationMapper.java b/jena-core/src/main/java/org/apache/jena/util/LocationMapper.java
index 14e54c9..ece87f5 100644
--- a/jena-core/src/main/java/org/apache/jena/util/LocationMapper.java
+++ b/jena-core/src/main/java/org/apache/jena/util/LocationMapper.java
@@ -41,7 +41,6 @@
*
* @see FileManager
*/
-
public class LocationMapper
{
static Logger log = LoggerFactory.getLogger(LocationMapper.class) ;
@@ -60,8 +59,8 @@
static LocationMapper theMapper = null ;
- /** Get the global LocationMapper */
- public static LocationMapper get()
+ /** For use within Jena libraries only. */
+ public static LocationMapper getInternal()
{
if ( theMapper == null )
{
@@ -72,7 +71,16 @@
return theMapper ;
}
- /** Set the global location mapper. (as returned by get())
+
+ /**
+ * Get the global LocationMapper.
+ * @deprecated Use {@code StreamManager} and {@code LocationMapper} from {@code org.apache.jena.riot.system.stream}.
+ */
+ @Deprecated
+ public static LocationMapper get() { return getInternal(); }
+
+
+ /** Set the global location mapper. (as returned by {@link #get()})
* If called before any call to get(), then the usual default global location mapper is not created
* @param globalLocationMapper
*/
@@ -90,11 +98,19 @@
return lMap ;
}
- /** Create a LocationMapper with no mapping yet */
+ /**
+ * Create a LocationMapper with no mapping yet
+ * @deprecated Use {@code StreamManager} and {@code LocationMapper} from {@code org.apache.jena.riot.system.stream}.
+ */
+ @Deprecated
public LocationMapper() { }
- /** Create a LocationMapper made like another one
- * This is a deep copy of the location and prefix maps..*/
+ /**
+ * Create a LocationMapper made like another one
+ * This is a deep copy of the location and prefix maps.
+ * @deprecated Use {@code StreamManager} and {@code LocationMapper} from {@code org.apache.jena.riot.system.stream}.
+ */
+ @Deprecated
public LocationMapper(LocationMapper locMapper)
{
altLocations.putAll(locMapper.altLocations) ;
@@ -103,13 +119,18 @@
/** Create a LocationMapper from an existing model
* @see org.apache.jena.vocabulary.LocationMappingVocab
+ * @deprecated Use {@code StreamManager} and {@code LocationMapper} from {@code org.apache.jena.riot.system.stream}.
*/
+ @Deprecated
public LocationMapper(Model model)
{
processConfig(model) ;
}
- /** Create a LocationMapper from a config file */
+ /**
+ * Create a LocationMapper from a config file
+ * @deprecated Use {@code StreamManager} and {@code LocationMapper} from {@code org.apache.jena.riot.system.stream}.
+ */
public LocationMapper(String config)
{
initFromPath(config, true) ;
diff --git a/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java b/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java
index e168f0c..e2dd538 100644
--- a/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java
+++ b/jena-core/src/main/java/org/apache/jena/util/LocatorClassLoader.java
@@ -22,6 +22,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+/**
+ * @deprecated Use {@code StreamManager} and {@code LocatorClassLoader} from {@code org.apache.jena.riot.system.stream}.
+ */
+@Deprecated
public class LocatorClassLoader implements Locator
{
static Logger log = LoggerFactory.getLogger(LocatorClassLoader.class) ;
diff --git a/jena-core/src/main/java/org/apache/jena/util/LocatorFile.java b/jena-core/src/main/java/org/apache/jena/util/LocatorFile.java
index 6eee313..66cb43d 100644
--- a/jena-core/src/main/java/org/apache/jena/util/LocatorFile.java
+++ b/jena-core/src/main/java/org/apache/jena/util/LocatorFile.java
@@ -30,8 +30,9 @@
/** Location files in the filing system.
* A FileLocator can have a "current directory" - this is separate from any
* location mapping (see @link{LocationMapping}) as it applies only to files.
+ * @deprecated Use {@code StreamManager} and {@code LocatorFile} from {@code org.apache.jena.riot.system.stream}.
*/
-
+@Deprecated
public class LocatorFile implements Locator
{
static Logger log = LoggerFactory.getLogger(LocatorFile.class) ;
diff --git a/jena-core/src/main/java/org/apache/jena/util/LocatorURL.java b/jena-core/src/main/java/org/apache/jena/util/LocatorURL.java
index be53c50..ea8749a 100644
--- a/jena-core/src/main/java/org/apache/jena/util/LocatorURL.java
+++ b/jena-core/src/main/java/org/apache/jena/util/LocatorURL.java
@@ -30,8 +30,9 @@
import org.slf4j.LoggerFactory;
/** Location files named by a URL
+ * @deprecated Use {@code StreamManager} and {@code LocatorHTTP} from {@code org.apache.jena.riot.system.stream}.
*/
-
+@Deprecated
public class LocatorURL implements Locator
{
static Logger log = LoggerFactory.getLogger(LocatorURL.class) ;
diff --git a/jena-core/src/main/java/org/apache/jena/util/LocatorZip.java b/jena-core/src/main/java/org/apache/jena/util/LocatorZip.java
index 841b0b5..554044d 100644
--- a/jena-core/src/main/java/org/apache/jena/util/LocatorZip.java
+++ b/jena-core/src/main/java/org/apache/jena/util/LocatorZip.java
@@ -27,9 +27,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** Location files in a zip file */
-
-
+/** Location files in a zip file
+ * @deprecated Use {@code StreamManager} and {@code LocatorZip} from {@code org.apache.jena.riot.system.stream}.
+ */
+@Deprecated
public class LocatorZip implements Locator
{
static Logger log = LoggerFactory.getLogger(LocatorZip.class) ;
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
index 09ebb5a..e4e2de0 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestContentAssembler.java
@@ -224,6 +224,7 @@
public void testContentAssemblerHasSuppliedFileManager()
{
+ @SuppressWarnings("deprecation")
FileManager fm = FileManager.create();
assertSame( fm, new ContentAssembler( fm ).getFileManager() );
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestDocumentManagerAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestDocumentManagerAssembler.java
index 994c2e5..36eb7eb 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestDocumentManagerAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestDocumentManagerAssembler.java
@@ -57,6 +57,7 @@
{
Resource root = resourceInModel( "x rdf:type ja:DocumentManager; x ja:fileManager f" );
Assembler a = new DocumentManagerAssembler();
+ @SuppressWarnings("deprecation")
FileManager fm = FileManager.create();
Assembler mock = new NamedObjectAssembler( resource( "f" ), fm );
Object x = a.open( mock, root );
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestFileManagerAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestFileManagerAssembler.java
index a209eb1..c034e74 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestFileManagerAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestFileManagerAssembler.java
@@ -55,6 +55,7 @@
public void testCreatesFileManagerWithLocationMapper()
{
Resource root = resourceInModel( "f rdf:type ja:FileManager; f ja:locationMapper r" );
+ @SuppressWarnings("deprecation")
LocationMapper mapper = new LocationMapper();
Assembler mock = new NamedObjectAssembler( resource( "r" ), mapper );
Assembler a = new FileManagerAssembler();
@@ -80,6 +81,7 @@
private Iterator<Locator> standardLocators()
{
+ @SuppressWarnings("deprecation")
FileManager fm = FileManager.createStd();
return fm.locators();
}
diff --git a/jena-core/src/test/java/org/apache/jena/assembler/test/TestLocationMapperAssembler.java b/jena-core/src/test/java/org/apache/jena/assembler/test/TestLocationMapperAssembler.java
index 5614c91..875a853 100644
--- a/jena-core/src/test/java/org/apache/jena/assembler/test/TestLocationMapperAssembler.java
+++ b/jena-core/src/test/java/org/apache/jena/assembler/test/TestLocationMapperAssembler.java
@@ -51,8 +51,9 @@
assertInstanceOf( LocationMapper.class, x );
}
+ @SuppressWarnings("deprecation")
public void testCreatesWithCorrectContent()
- { // TODO should really have some mroe of these
+ {
Resource root = resourceInModel( "r rdf:type ja:LocationMapper; r lm:mapping _m; _m lm:name 'alpha'; _m lm:altName 'beta'" );
Assembler a = new LocationMapperAssembler();
Object x = a.open( root );
diff --git a/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java b/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java
index 5ef47e4..bffbe6e 100644
--- a/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java
+++ b/jena-core/src/test/java/org/apache/jena/util/TestFileManager.java
@@ -147,6 +147,7 @@
public void testLocationMappingURLtoFileOpen()
{
+ @SuppressWarnings("deprecation")
LocationMapper locMap = new LocationMapper(TestLocationMapper.mapping) ;
FileManager fileManager = new FileManagerImpl(locMap) ;
fileManager.addLocatorFile() ;
@@ -157,6 +158,7 @@
public void testLocationMappingURLtoFileOpenNotFound()
{
+ @SuppressWarnings("deprecation")
LocationMapper locMap = new LocationMapper(TestLocationMapper.mapping) ;
FileManager fileManager = new FileManagerImpl(locMap) ;
fileManager.addLocatorClassLoader(fileManager.getClass().getClassLoader()) ;
diff --git a/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java b/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java
index 09e2934..eedb386 100644
--- a/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java
+++ b/jena-core/src/test/java/org/apache/jena/util/TestLocationMapper.java
@@ -28,7 +28,7 @@
/** TestLocationMapper
*/
-
+@SuppressWarnings("deprecation")
public class TestLocationMapper extends TestCase
{
static Logger log = LoggerFactory.getLogger(TestLocationMapper.class) ;
diff --git a/jena-core/src/test/java/org/apache/jena/util/TestLocators.java b/jena-core/src/test/java/org/apache/jena/util/TestLocators.java
index 0e9daad..93641f3 100644
--- a/jena-core/src/test/java/org/apache/jena/util/TestLocators.java
+++ b/jena-core/src/test/java/org/apache/jena/util/TestLocators.java
@@ -20,6 +20,7 @@
import org.apache.jena.rdf.model.test.ModelTestBase ;
+@SuppressWarnings("deprecation")
public class TestLocators extends ModelTestBase
{
private static final ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
