From 2ba5b2fa4d5585100813a066177deae0ec38a328 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Mon, 3 Jun 2019 09:02:55 +0200 Subject: Nonfunctional changes only --- .../yahoo/container/xml/providers/DatatypeFactoryProvider.java | 7 ++----- .../container/xml/providers/DocumentBuilderFactoryProvider.java | 8 ++++---- .../yahoo/container/xml/providers/SAXParserFactoryProvider.java | 8 ++++---- .../com/yahoo/container/xml/providers/SchemaFactoryProvider.java | 9 ++++----- .../container/xml/providers/TransformerFactoryProvider.java | 8 ++++---- .../yahoo/container/xml/providers/XMLEventFactoryProvider.java | 5 +++-- .../yahoo/container/xml/providers/XMLInputFactoryProvider.java | 5 +++-- .../yahoo/container/xml/providers/XMLOutputFactoryProvider.java | 5 +++-- .../com/yahoo/container/xml/providers/XPathFactoryProvider.java | 5 +++-- .../com/yahoo/language/provider/DefaultLinguisticsProvider.java | 2 +- 10 files changed, 31 insertions(+), 31 deletions(-) (limited to 'container-core') 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 3a597a34142..ffce3649419 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 @@ -7,8 +7,7 @@ import javax.xml.datatype.DatatypeConfigurationException; import javax.xml.datatype.DatatypeFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated @@ -18,9 +17,7 @@ public class DatatypeFactoryProvider implements Provider { @Override public DatatypeFactory get() { try { - return DatatypeFactory.newInstance( - FACTORY_CLASS, - this.getClass().getClassLoader()); + return DatatypeFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader()); } catch (DatatypeConfigurationException e) { throw new IllegalStateException(e); } 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 10d707337b5..37b8dff8bf4 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 @@ -6,20 +6,20 @@ import com.yahoo.container.di.componentgraph.Provider; import javax.xml.parsers.DocumentBuilderFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class DocumentBuilderFactoryProvider implements Provider { + public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"; @Override public DocumentBuilderFactory get() { - return DocumentBuilderFactory.newInstance(FACTORY_CLASS, - this.getClass().getClassLoader()); + return DocumentBuilderFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader()); } @Override public void deconstruct() { } + } 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 2ef44fed3eb..a8ac55a8aca 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 @@ -6,20 +6,20 @@ import com.yahoo.container.di.componentgraph.Provider; import javax.xml.parsers.SAXParserFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class SAXParserFactoryProvider implements Provider { + public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"; @Override public SAXParserFactory get() { - return SAXParserFactory.newInstance(FACTORY_CLASS, - this.getClass().getClassLoader()); + return SAXParserFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader()); } @Override public void deconstruct() { } + } 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 ec024f60909..bbcdf7c9553 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 @@ -7,21 +7,20 @@ import javax.xml.XMLConstants; import javax.xml.validation.SchemaFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class SchemaFactoryProvider implements Provider { + public static final String FACTORY_CLASS = "com.sun.org.apache.xerces.internal.jaxp.validation.XMLSchemaFactory"; @Override public SchemaFactory get() { - return SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI, - FACTORY_CLASS, - this.getClass().getClassLoader()); + return SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI, FACTORY_CLASS, this.getClass().getClassLoader()); } @Override public void deconstruct() { } + } 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 fad3fbd964a..974d2e6a259 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 @@ -6,20 +6,20 @@ import com.yahoo.container.di.componentgraph.Provider; import javax.xml.transform.TransformerFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class TransformerFactoryProvider implements Provider { + public static final String FACTORY_CLASS = "com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl"; @Override public TransformerFactory get() { - return TransformerFactory.newInstance(FACTORY_CLASS, - this.getClass().getClassLoader()); + return TransformerFactory.newInstance(FACTORY_CLASS, this.getClass().getClassLoader()); } @Override public void deconstruct() { } + } 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 e894c39865b..702ecedcc93 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 @@ -6,12 +6,12 @@ import com.yahoo.container.di.componentgraph.Provider; import javax.xml.stream.XMLEventFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class XMLEventFactoryProvider implements Provider { + public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl"; @Override @@ -23,4 +23,5 @@ public class XMLEventFactoryProvider implements Provider { @Override public void deconstruct() { } + } 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 8bdef13fbcc..9f3518525de 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 @@ -6,12 +6,12 @@ import com.yahoo.container.di.componentgraph.Provider; import javax.xml.stream.XMLInputFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class XMLInputFactoryProvider implements Provider { + private static final String INPUT_FACTORY_INTERFACE = XMLInputFactory.class.getName(); public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLInputFactoryImpl"; @@ -28,4 +28,5 @@ public class XMLInputFactoryProvider implements Provider { @Override public void deconstruct() { } + } 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 ac0715b6b88..ab28ba2e923 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 @@ -6,12 +6,12 @@ import com.yahoo.container.di.componentgraph.Provider; import javax.xml.stream.XMLOutputFactory; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class XMLOutputFactoryProvider implements Provider { + public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.XMLOutputFactoryImpl"; @Override public XMLOutputFactory get() { @@ -24,4 +24,5 @@ public class XMLOutputFactoryProvider implements Provider { @Override public void deconstruct() { } + } 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 7c6837d9b97..407369032cf 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 @@ -7,12 +7,12 @@ import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; /** - * @author Einar M R Rosenvinge - * @since 5.1.29 + * @author Einar M R Rosenvinge * @deprecated Do not use! */ @Deprecated public class XPathFactoryProvider implements Provider { + public static final String FACTORY_CLASS = "com.sun.org.apache.xpath.internal.jaxp.XPathFactoryImpl"; @Override @@ -28,4 +28,5 @@ public class XPathFactoryProvider implements Provider { @Override public void deconstruct() { } + } diff --git a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java index d9af9bf88b2..ace5a7ab304 100644 --- a/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java +++ b/container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java @@ -14,12 +14,12 @@ import com.yahoo.language.opennlp.OpenNlpLinguistics; * * @author bratseth */ +@SuppressWarnings("unused") // Injected public class DefaultLinguisticsProvider implements Provider { // Use lazy initialization to avoid expensive (memory-wise) instantiation f private volatile Supplier linguisticsSupplier = Suppliers.memoize(OpenNlpLinguistics::new); - @SuppressWarnings("deprecation") @Inject public DefaultLinguisticsProvider() { } -- cgit v1.2.3