Deprecate all builtin XML providers in jdisc.

2 files changed, 4 insertions, 16 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/xml/bind/JAXBContextFactoryTest.java b/container-core/src/test/java/com/yahoo/container/xml/bind/JAXBContextFactoryTest.java
index 3b3a8127f5d..670b69516bf 100644
--- a/container-core/src/test/java/com/yahoo/container/xml/bind/JAXBContextFactoryTest.java
+++ b/container-core/src/test/java/com/yahoo/container/xml/bind/JAXBContextFactoryTest.java
@@ -1,7 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.xml.bind;
 
-import com.yahoo.container.xml.providers.JAXBContextFactoryProvider;
 import org.junit.Test;
 
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -13,13 +12,14 @@ import static org.junit.Assert.fail;
  * @author gjoranv
  * @since 5.3
  */
+@SuppressWarnings("deprecation")
 public class JAXBContextFactoryTest {
     @Test
     public void testInstantiationAndDestruction() {
 
-        JAXBContextFactoryProvider provider = new JAXBContextFactoryProvider();
+        com.yahoo.container.xml.providers.JAXBContextFactoryProvider provider = new com.yahoo.container.xml.providers.JAXBContextFactoryProvider();
         JAXBContextFactory factory = provider.get();
-        assertThat(factory.getClass().getName(), equalTo(JAXBContextFactoryProvider.FACTORY_CLASS));
+        assertThat(factory.getClass().getName(), equalTo(com.yahoo.container.xml.providers.JAXBContextFactoryProvider.FACTORY_CLASS));
 
         try {
             JAXBContextFactory.getContextPath((Class) null);
diff --git a/container-core/src/test/java/com/yahoo/container/xml/providers/XMLProviderTest.java b/container-core/src/test/java/com/yahoo/container/xml/providers/XMLProviderTest.java
index df0238c88a9..e3b546c3c22 100644
--- a/container-core/src/test/java/com/yahoo/container/xml/providers/XMLProviderTest.java
+++ b/container-core/src/test/java/com/yahoo/container/xml/providers/XMLProviderTest.java
@@ -1,18 +1,6 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.container.xml.providers;
 
-import com.yahoo.container.Server;
-import com.yahoo.container.xml.bind.JAXBContextFactory;
-import com.yahoo.container.xml.providers.DatatypeFactoryProvider;
-import com.yahoo.container.xml.providers.DocumentBuilderFactoryProvider;
-import com.yahoo.container.xml.providers.JAXBContextFactoryProvider;
-import com.yahoo.container.xml.providers.SAXParserFactoryProvider;
-import com.yahoo.container.xml.providers.SchemaFactoryProvider;
-import com.yahoo.container.xml.providers.TransformerFactoryProvider;
-import com.yahoo.container.xml.providers.XMLEventFactoryProvider;
-import com.yahoo.container.xml.providers.XMLInputFactoryProvider;
-import com.yahoo.container.xml.providers.XMLOutputFactoryProvider;
-import com.yahoo.container.xml.providers.XPathFactoryProvider;
 import org.junit.Test;
 
 import javax.xml.datatype.DatatypeFactory;
@@ -27,12 +15,12 @@ import javax.xml.xpath.XPathFactory;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.junit.Assert.fail;
 
 /**
  * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
  * @since 5.1.29
  */
+@SuppressWarnings("deprecation")
 public class XMLProviderTest {
 
     @Test