summaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@verizonmedia.com>2019-06-03 09:02:55 +0200
committerJon Bratseth <bratseth@verizonmedia.com>2019-06-03 09:02:55 +0200
commit2ba5b2fa4d5585100813a066177deae0ec38a328 (patch)
treef057260cee8dc87af8fc2a96e893a9dd4617e462 /container-core
parenta63f4ffec464b2951cc03d300b33ba47216ac6a6 (diff)
Nonfunctional changes only
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/DatatypeFactoryProvider.java7
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/DocumentBuilderFactoryProvider.java8
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/SAXParserFactoryProvider.java8
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/SchemaFactoryProvider.java9
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/TransformerFactoryProvider.java8
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XMLEventFactoryProvider.java5
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XMLInputFactoryProvider.java5
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XMLOutputFactoryProvider.java5
-rw-r--r--container-core/src/main/java/com/yahoo/container/xml/providers/XPathFactoryProvider.java5
-rw-r--r--container-core/src/main/java/com/yahoo/language/provider/DefaultLinguisticsProvider.java2
10 files changed, 31 insertions, 31 deletions
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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @deprecated Do not use!
*/
@Deprecated
@@ -18,9 +17,7 @@ public class DatatypeFactoryProvider implements Provider<DatatypeFactory> {
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @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";
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @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";
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @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";
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @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";
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @deprecated Do not use!
*/
@Deprecated
public class XMLEventFactoryProvider implements Provider<XMLEventFactory> {
+
public static final String FACTORY_CLASS = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl";
@Override
@@ -23,4 +23,5 @@ public class XMLEventFactoryProvider implements Provider<XMLEventFactory> {
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @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";
@@ -28,4 +28,5 @@ public class XMLInputFactoryProvider implements Provider<XMLInputFactory> {
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @deprecated Do not use!
*/
@Deprecated
public class XMLOutputFactoryProvider implements Provider<XMLOutputFactory> {
+
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<XMLOutputFactory> {
@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 <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
- * @since 5.1.29
+ * @author Einar M R Rosenvinge
* @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";
@Override
@@ -28,4 +28,5 @@ public class XPathFactoryProvider implements Provider<XPathFactory> {
@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<Linguistics> {
// Use lazy initialization to avoid expensive (memory-wise) instantiation f
private volatile Supplier<Linguistics> linguisticsSupplier = Suppliers.memoize(OpenNlpLinguistics::new);
- @SuppressWarnings("deprecation")
@Inject
public DefaultLinguisticsProvider() { }