From 65e1337d35cf7aa398798b8a7a8034518943940e Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 21 May 2024 11:16:25 +0200 Subject: [PATCH] Polishing --- ...SpringConfiguredWithAutoProxyingTests.java | 7 +++++-- .../PersistenceUnitReader.java | 20 ++++++++----------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java index 9be725fa8c18..f47eb7ba3c53 100644 --- a/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java +++ b/spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/SpringConfiguredWithAutoProxyingTests.java @@ -20,11 +20,14 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; -public class SpringConfiguredWithAutoProxyingTests { +/** + * @author Ramnivas Laddad + * @author Juergen Hoeller + */ +class SpringConfiguredWithAutoProxyingTests { @Test void springConfiguredAndAutoProxyUsedTogether() { - // instantiation is sufficient to trigger failure if this is going to fail... new ClassPathXmlApplicationContext("org/springframework/beans/factory/aspectj/springConfigured.xml"); } diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java index 00a167f8d5ca..ddd74f19233e 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/persistenceunit/PersistenceUnitReader.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2022 the original author or authors. + * Copyright 2002-2024 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. @@ -154,7 +154,7 @@ public SpringPersistenceUnitInfo[] readPersistenceUnitInfos(String[] persistence /** * Validate the given stream and return a valid DOM document for parsing. */ - protected Document buildDocument(ErrorHandler handler, InputStream stream) + Document buildDocument(ErrorHandler handler, InputStream stream) throws ParserConfigurationException, SAXException, IOException { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); @@ -168,9 +168,7 @@ protected Document buildDocument(ErrorHandler handler, InputStream stream) /** * Parse the validated document and add entries to the given unit info list. */ - protected List parseDocument( - Resource resource, Document document, List infos) throws IOException { - + void parseDocument(Resource resource, Document document, List infos) throws IOException { Element persistence = document.getDocumentElement(); String version = persistence.getAttribute(PERSISTENCE_VERSION); URL rootUrl = determinePersistenceUnitRootUrl(resource); @@ -179,14 +177,12 @@ protected List parseDocument( for (Element unit : units) { infos.add(parsePersistenceUnitInfo(unit, version, rootUrl)); } - - return infos; } /** * Parse the unit info DOM element. */ - protected SpringPersistenceUnitInfo parsePersistenceUnitInfo( + SpringPersistenceUnitInfo parsePersistenceUnitInfo( Element persistenceUnit, String version, @Nullable URL rootUrl) throws IOException { SpringPersistenceUnitInfo unitInfo = new SpringPersistenceUnitInfo(); @@ -253,7 +249,7 @@ protected SpringPersistenceUnitInfo parsePersistenceUnitInfo( /** * Parse the {@code property} XML elements. */ - protected void parseProperties(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { + void parseProperties(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { Element propRoot = DomUtils.getChildElementByTagName(persistenceUnit, PROPERTIES); if (propRoot == null) { return; @@ -269,7 +265,7 @@ protected void parseProperties(Element persistenceUnit, SpringPersistenceUnitInf /** * Parse the {@code class} XML elements. */ - protected void parseManagedClasses(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { + void parseManagedClasses(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { List classes = DomUtils.getChildElementsByTagName(persistenceUnit, MANAGED_CLASS_NAME); for (Element element : classes) { String value = DomUtils.getTextValue(element).trim(); @@ -282,7 +278,7 @@ protected void parseManagedClasses(Element persistenceUnit, SpringPersistenceUni /** * Parse the {@code mapping-file} XML elements. */ - protected void parseMappingFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { + void parseMappingFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) { List files = DomUtils.getChildElementsByTagName(persistenceUnit, MAPPING_FILE_NAME); for (Element element : files) { String value = DomUtils.getTextValue(element).trim(); @@ -295,7 +291,7 @@ protected void parseMappingFiles(Element persistenceUnit, SpringPersistenceUnitI /** * Parse the {@code jar-file} XML elements. */ - protected void parseJarFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) throws IOException { + void parseJarFiles(Element persistenceUnit, SpringPersistenceUnitInfo unitInfo) throws IOException { List jars = DomUtils.getChildElementsByTagName(persistenceUnit, JAR_FILE_URL); for (Element element : jars) { String value = DomUtils.getTextValue(element).trim();