diff options
author | gjoranv <gv@oath.com> | 2018-05-02 16:55:09 +0200 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2018-05-02 16:55:09 +0200 |
commit | f41b5fb06fc7bf6cfc6dd07b767acec03cea3632 (patch) | |
tree | efee2f88bb4dd072f36fbea333fbc2b82ecfabe6 /container-core/src/main | |
parent | 82dda76cc527513e92de314da61538235243c65b (diff) |
Deprecate all builtin XML providers in jdisc.
Diffstat (limited to 'container-core/src/main')
12 files changed, 27 insertions, 7 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/xml/bind/JAXBContextFactory.java b/container-core/src/main/java/com/yahoo/container/xml/bind/JAXBContextFactory.java index bfed9d8023f..c2355ce74be 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/bind/JAXBContextFactory.java +++ b/container-core/src/main/java/com/yahoo/container/xml/bind/JAXBContextFactory.java @@ -16,7 +16,9 @@ import javax.xml.bind.JAXBException; * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @author gjoranv * @since 5.3 + * @deprecated Do not use! */ +@Deprecated public class JAXBContextFactory { public static final String FACTORY_CLASS = "com.sun.xml.internal.bind.v2.ContextFactory"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/bind/package-info.java b/container-core/src/main/java/com/yahoo/container/xml/bind/package-info.java index 1ffa771783d..9bb1e7f6597 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/bind/package-info.java +++ b/container-core/src/main/java/com/yahoo/container/xml/bind/package-info.java @@ -1,7 +1,5 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. @ExportPackage -@PublicApi package com.yahoo.container.xml.bind; -import com.yahoo.api.annotations.PublicApi; import com.yahoo.osgi.annotation.ExportPackage; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java index 8dc30b2f97c..3a597a34142 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java @@ -9,7 +9,9 @@ import javax.xml.datatype.DatatypeFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class DatatypeFactoryProvider implements Provider<DatatypeFactory> { public static final String FACTORY_CLASS = DatatypeFactory.DATATYPEFACTORY_IMPLEMENTATION_CLASS; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java index 46aca59ae92..10d707337b5 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java @@ -8,7 +8,9 @@ import javax.xml.parsers.DocumentBuilderFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class DocumentBuilderFactoryProvider implements Provider<DocumentBuilderFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/JAXBContextFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/JAXBContextFactoryProvider.java index 8b8002ec379..6d82fa7af82 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/JAXBContextFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/JAXBContextFactoryProvider.java @@ -2,18 +2,20 @@ package com.yahoo.container.xml.providers; import com.yahoo.container.di.componentgraph.Provider; -import com.yahoo.container.xml.bind.JAXBContextFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ -public class JAXBContextFactoryProvider implements Provider<JAXBContextFactory> { - public static final String FACTORY_CLASS = JAXBContextFactory.class.getName(); +@Deprecated +@SuppressWarnings("deprecation") +public class JAXBContextFactoryProvider implements Provider<com.yahoo.container.xml.bind.JAXBContextFactory> { + public static final String FACTORY_CLASS = com.yahoo.container.xml.bind.JAXBContextFactory.class.getName(); @Override - public JAXBContextFactory get() { - return new JAXBContextFactory(); + public com.yahoo.container.xml.bind.JAXBContextFactory get() { + return new com.yahoo.container.xml.bind.JAXBContextFactory(); } @Override diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java index 685e23ac852..2ef44fed3eb 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java @@ -8,7 +8,9 @@ import javax.xml.parsers.SAXParserFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class SAXParserFactoryProvider implements Provider<SAXParserFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java index f9115874fb6..ec024f60909 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java @@ -9,7 +9,9 @@ import javax.xml.validation.SchemaFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class SchemaFactoryProvider implements Provider<SchemaFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java index e1a3645610c..fad3fbd964a 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java @@ -8,7 +8,9 @@ import javax.xml.transform.TransformerFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class TransformerFactoryProvider implements Provider<TransformerFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java index 51d2ed4d390..e894c39865b 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java @@ -8,7 +8,9 @@ import javax.xml.stream.XMLEventFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class XMLEventFactoryProvider implements Provider<XMLEventFactory> { public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java index a17f09164c8..83bb5b45ee2 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java @@ -8,7 +8,9 @@ import javax.xml.stream.XMLInputFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class XMLInputFactoryProvider implements Provider<XMLInputFactory> { private static final String INPUT_FACTORY_INTERFACE = XMLInputFactory.class.getName(); public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLInputFactoryImpl"; diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java index f49ed58ccf7..ac0715b6b88 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java @@ -8,7 +8,9 @@ import javax.xml.stream.XMLOutputFactory; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class XMLOutputFactoryProvider implements Provider<XMLOutputFactory> { public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLOutputFactoryImpl"; @Override diff --git a/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java b/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java index 0207ebbee89..7c6837d9b97 100644 --- a/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java @@ -9,7 +9,9 @@ import javax.xml.xpath.XPathFactoryConfigurationException; /** * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> * @since 5.1.29 + * @deprecated Do not use! */ +@Deprecated public class XPathFactoryProvider implements Provider<XPathFactory> { public static final String FACTORY_CLASS = "com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl"; |