From 1cb381e9a78b0f6435eb56a5066aa31a2193c41a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 13 Jan 2017 10:53:20 +0100 Subject: [PATCH] Consistent deprecation markers on JDK 9 --- ...wiredAnnotationBeanPostProcessorTests.java | 2 ++ .../util/xml/AbstractStaxHandlerTestCase.java | 7 +++--- .../xml/AbstractStaxXMLReaderTestCase.java | 9 ++++--- .../util/xml/DomContentHandlerTests.java | 25 ++++++++++--------- .../oxm/jaxb/Jaxb2Marshaller.java | 11 ++++---- .../oxm/support/AbstractMarshaller.java | 1 + .../dao/support/DataAccessUtilsTests.java | 9 +++---- 7 files changed, 35 insertions(+), 29 deletions(-) diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java index bc388847a12..2640473617f 100644 --- a/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java +++ b/spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java @@ -3543,6 +3543,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class CustomHashMap extends LinkedHashMap implements CustomMap { } @@ -3551,6 +3552,7 @@ public class AutowiredAnnotationBeanPostProcessorTests { } + @SuppressWarnings("serial") public static class CustomHashSet extends LinkedHashSet implements CustomSet { } diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java index b2ba4227f81..37d110b6b80 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxHandlerTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,6 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; import org.xmlunit.util.Predicate; import static org.junit.Assert.*; @@ -59,12 +58,14 @@ public abstract class AbstractStaxHandlerTestCase { private static final Predicate nodeFilter = (n -> n.getNodeType() != Node.COMMENT_NODE && n.getNodeType() != Node.DOCUMENT_TYPE_NODE && n.getNodeType() != Node.PROCESSING_INSTRUCTION_NODE); + private XMLReader xmlReader; @Before + @SuppressWarnings("deprecation") // on JDK 9 public void createXMLReader() throws Exception { - xmlReader = XMLReaderFactory.createXMLReader(); + xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader(); } diff --git a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java index ba172483cd3..7b5f1a014b6 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java +++ b/spring-core/src/test/java/org/springframework/util/xml/AbstractStaxXMLReaderTestCase.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -37,7 +37,6 @@ import org.xml.sax.Locator; import org.xml.sax.XMLReader; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.AttributesImpl; -import org.xml.sax.helpers.XMLReaderFactory; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; @@ -47,6 +46,9 @@ import org.springframework.tests.MockitoUtils.InvocationArgumentsAdapter; import static org.junit.Assert.*; import static org.mockito.BDDMockito.*; +/** + * @author Arjen Poutsma + */ public abstract class AbstractStaxXMLReaderTestCase { protected static XMLInputFactory inputFactory; @@ -57,9 +59,10 @@ public abstract class AbstractStaxXMLReaderTestCase { @Before + @SuppressWarnings("deprecation") // on JDK 9 public void setUp() throws Exception { inputFactory = XMLInputFactory.newInstance(); - standardReader = XMLReaderFactory.createXMLReader(); + standardReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader(); standardContentHandler = mockContentHandler(); standardReader.setContentHandler(standardContentHandler); } diff --git a/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java b/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java index f97c9896fb0..bd73472fc81 100644 --- a/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java +++ b/spring-core/src/test/java/org/springframework/util/xml/DomContentHandlerTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2014 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,21 +16,19 @@ package org.springframework.util.xml; +import java.io.StringReader; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; + import org.junit.Before; import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.InputSource; import org.xml.sax.XMLReader; -import org.xml.sax.helpers.XMLReaderFactory; - -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import java.io.StringReader; - -import static org.junit.Assert.assertThat; -import static org.xmlunit.matchers.CompareMatcher.isSimilarTo; +import static org.junit.Assert.*; +import static org.xmlunit.matchers.CompareMatcher.*; /** * Unit tests for {@link DomContentHandler}. @@ -49,6 +47,7 @@ public class DomContentHandlerTests { private static final String XML_2_SNIPPET = "" + ""; + private Document expected; private DomContentHandler handler; @@ -59,15 +58,18 @@ public class DomContentHandlerTests { private DocumentBuilder documentBuilder; + @Before + @SuppressWarnings("deprecation") // on JDK 9 public void setUp() throws Exception { DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance(); documentBuilderFactory.setNamespaceAware(true); documentBuilder = documentBuilderFactory.newDocumentBuilder(); result = documentBuilder.newDocument(); - xmlReader = XMLReaderFactory.createXMLReader(); + xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader(); } + @Test public void contentHandlerDocumentNamespacePrefixes() throws Exception { xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); @@ -96,7 +98,6 @@ public class DomContentHandlerTests { xmlReader.setContentHandler(handler); xmlReader.parse(new InputSource(new StringReader(XML_2_SNIPPET))); assertThat("Invalid result", result, isSimilarTo(expected)); - } -} \ No newline at end of file +} diff --git a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java index 88d9176ada3..00896f35286 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/jaxb/Jaxb2Marshaller.java @@ -100,8 +100,7 @@ import org.springframework.util.StringUtils; import org.springframework.util.xml.StaxUtils; /** - * Implementation of the {@code GenericMarshaller} interface for JAXB 2.1/2.2, - * as included in JDK 6 update 4+ and Java 7/8. + * Implementation of the {@code GenericMarshaller} interface for JAXB 2.2. * *

The typical usage will be to set either the "contextPath" or the "classesToBeBound" * property on this bean, possibly customize the marshaller and unmarshaller by setting @@ -544,6 +543,7 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi } } + @SuppressWarnings("deprecation") // on JDK 9 private Schema loadSchema(Resource[] resources, String schemaLanguage) throws IOException, SAXException { if (logger.isDebugEnabled()) { logger.debug("Setting validation schema to " + @@ -588,7 +588,6 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi supportsInternal(classArgument, false)); } else if (typeArgument instanceof GenericArrayType) { - // Only on JDK 6 - see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=5041784 GenericArrayType arrayType = (GenericArrayType) typeArgument; return (Byte.TYPE == arrayType.getGenericComponentType()); } @@ -773,9 +772,8 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi } catch (NullPointerException ex) { if (!isSupportDtd()) { - throw new UnmarshallingFailureException("NPE while unmarshalling. " + - "This can happen on JDK 1.6 due to the presence of DTD " + - "declarations, which are disabled.", ex); + throw new UnmarshallingFailureException("NPE while unmarshalling: " + + "This can happen due to the presence of DTD declarations which are disabled.", ex); } throw ex; } @@ -804,6 +802,7 @@ public class Jaxb2Marshaller implements MimeMarshaller, MimeUnmarshaller, Generi } } + @SuppressWarnings("deprecation") // on JDK 9 private Source processSource(Source source) { if (StaxUtils.isStaxSource(source) || source instanceof DOMSource) { return source; diff --git a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java index 40f18637df3..6a396708c81 100644 --- a/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java +++ b/spring-oxm/src/main/java/org/springframework/oxm/support/AbstractMarshaller.java @@ -183,6 +183,7 @@ public abstract class AbstractMarshaller implements Marshaller, Unmarshaller { * @return the XMLReader * @throws SAXException if thrown by JAXP methods */ + @SuppressWarnings("deprecation") // on JDK 9 protected XMLReader createXmlReader() throws SAXException { XMLReader xmlReader = org.xml.sax.helpers.XMLReaderFactory.createXMLReader(); xmlReader.setFeature("http://apache.org/xml/features/disallow-doctype-decl", !isSupportDtd()); diff --git a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java index 5be4b3470fe..638cd924f32 100644 --- a/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java +++ b/spring-tx/src/test/java/org/springframework/dao/support/DataAccessUtilsTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2016 the original author or authors. + * Copyright 2002-2017 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -171,6 +171,7 @@ public class DataAccessUtilsTests { } @Test + @SuppressWarnings("deprecation") // on JDK 9 public void withEquivalentIntegerInstanceTwice() { Collection col = new ArrayList<>(2); col.add(new Integer(5)); @@ -273,10 +274,8 @@ public class DataAccessUtilsTests { public static class MapPersistenceExceptionTranslator implements PersistenceExceptionTranslator { - /** - * in to out - */ - private Map translations = new HashMap<>(); + // in to out + private final Map translations = new HashMap<>(); public void addTranslation(RuntimeException in, RuntimeException out) { this.translations.put(in, out);