diff options
author | Jon Bratseth <bratseth@verizonmedia.com> | 2019-06-03 09:02:55 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@verizonmedia.com> | 2019-06-03 09:02:55 +0200 |
commit | 2ba5b2fa4d5585100813a066177deae0ec38a328 (patch) | |
tree | f057260cee8dc87af8fc2a96e893a9dd4617e462 | |
parent | a63f4ffec464b2951cc03d300b33ba47216ac6a6 (diff) |
Nonfunctional changes only
17 files changed, 44 insertions, 40 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() { } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java index 1a08b569b4d..a3f8819f843 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricConsumerProviderProvider.java @@ -15,6 +15,7 @@ import com.yahoo.metrics.MetricsPresentationConfig; * * @author bratseth */ +@SuppressWarnings("unused") // Injected public class MetricConsumerProviderProvider implements Provider<MetricConsumerProvider> { private final MetricConsumerProvider provided; @@ -30,7 +31,6 @@ public class MetricConsumerProviderProvider implements Provider<MetricConsumerPr public MetricConsumerProvider get() { return provided; } @Override - public void deconstruct() { - } + public void deconstruct() { } } diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java index 57613113e73..d18e1ee2d5d 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/metric/MetricProvider.java @@ -32,8 +32,6 @@ public final class MetricProvider implements Provider<Metric> { } @Override - public void deconstruct() { - - } + public void deconstruct() { } } diff --git a/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/JerseyServletProvider.java b/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/JerseyServletProvider.java index 1dbe410ba54..b8c714fd3e3 100644 --- a/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/JerseyServletProvider.java +++ b/container-jersey2/src/main/java/com/yahoo/container/servlet/jersey/JerseyServletProvider.java @@ -32,7 +32,9 @@ import static com.yahoo.container.servlet.jersey.util.ResourceConfigUtil.registe * @author Tony Vaagenes * @author ollivir */ +@SuppressWarnings("unused") // Injected public class JerseyServletProvider implements Provider<ServletHolder> { + private final ServletHolder jerseyServletHolder; public JerseyServletProvider(RestApiContext restApiContext) { @@ -40,7 +42,7 @@ public class JerseyServletProvider implements Provider<ServletHolder> { } private ResourceConfig resourceConfig(RestApiContext restApiContext) { - final ResourceConfig resourceConfig = ResourceConfig + ResourceConfig resourceConfig = ResourceConfig .forApplication(new JerseyApplication(resourcesAndProviders(restApiContext.getBundles()))); registerComponent(resourceConfig, componentInjectorBinder(restApiContext)); @@ -51,7 +53,7 @@ public class JerseyServletProvider implements Provider<ServletHolder> { } private static Collection<Class<?>> resourcesAndProviders(Collection<BundleInfo> bundles) { - final List<Class<?>> ret = new ArrayList<>(); + List<Class<?>> ret = new ArrayList<>(); for (BundleInfo bundle : bundles) { for (String classEntry : bundle.getClassEntries()) { @@ -115,4 +117,5 @@ public class JerseyServletProvider implements Provider<ServletHolder> { @Override public void deconstruct() { } + } diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java index 89d4aa05200..b90f96fb240 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusClientProvider.java @@ -14,7 +14,7 @@ import com.yahoo.messagebus.shared.SharedSourceSession; /** * @author Tony Vaagenes - * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a> + * @author Einar M R Rosenvinge */ public class MbusClientProvider implements Provider<MbusClient> { diff --git a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusServerProvider.java b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusServerProvider.java index 58f0df6ddcf..1ab418fd523 100644 --- a/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusServerProvider.java +++ b/container-messagebus/src/main/java/com/yahoo/container/jdisc/messagebus/MbusServerProvider.java @@ -18,6 +18,7 @@ import java.util.logging.Logger; * @author Tony Vaagenes */ public class MbusServerProvider implements Provider<MbusServer> { + private static final Logger log = Logger.getLogger(MbusServerProvider.class.getName()); private final MbusServer server; @@ -52,4 +53,5 @@ public class MbusServerProvider implements Provider<MbusServer> { server.release(); sessionRef.getReference().close(); } + } diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java index 1754b6cc028..2f241f9c7a3 100644 --- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java +++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java @@ -171,7 +171,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> { } } - private void doVisit(final long timestamp, final Object payload, final boolean hasChildren) throws IOException { + private void doVisit(long timestamp, Object payload, boolean hasChildren) throws IOException { boolean dirty = false; if (timestamp != 0L) { header(); diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPollerProvider.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPollerProvider.java index dea7b2b4809..30fd79c1338 100644 --- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPollerProvider.java +++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/SystemPollerProvider.java @@ -30,4 +30,5 @@ public class SystemPollerProvider implements Provider<SystemPoller> { public SystemPoller get() { return poller; } + } |