diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java index 16779e0ce..4591a1b59 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java @@ -67,7 +67,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid private final String configFileName; private final Set loadedFileUrls = new HashSet<>(); private Set includedFileNames; - private FileManager fileManager; + protected FileManager fileManager; @Inject public void setFileManagerFactory(FileManagerFactory fileManagerFactory) { @@ -120,7 +120,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid return loadedFileUrls.stream().anyMatch(url -> fileManager.fileNeedsReloading(url)); } - private List parseFile(String configFileName) { + protected List parseFile(String configFileName) { try { loadedFileUrls.clear(); return loadConfigurationFiles(configFileName, null); @@ -131,7 +131,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid } } - private List loadConfigurationFiles(String fileName, Element includeElement) { + protected List loadConfigurationFiles(String fileName, Element includeElement) { if (includedFileNames.contains(fileName)) { return emptyList(); } @@ -149,7 +149,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid return finalDocs; } - private Iterator getURLs(String fileName) { + protected Iterator getURLs(String fileName) { Iterator urls = null; try { urls = getConfigurationUrls(fileName); @@ -167,7 +167,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid return ClassLoaderUtil.getResources(fileName, XmlConfigurationProvider.class, false); } - private List getDocs(Iterator urls, String fileName, Element includeElement) { + protected List getDocs(Iterator urls, String fileName, Element includeElement) { List docs = new ArrayList<>(); while (urls.hasNext()) { @@ -204,7 +204,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid return docs; } - private List getFinalDocs(List docs) { + protected List getFinalDocs(List docs) { List finalDocs = new ArrayList<>(); docs.sort(Comparator.comparing(XmlHelper::getLoadOrder)); for (Document doc : docs) { diff --git a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java index a593114d3..cd93e5cf2 100644 --- a/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java +++ b/core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java @@ -962,7 +962,7 @@ public abstract class XmlDocConfigurationProvider implements ConfigurationProvid * @return A list of Interceptor objects * @throws ConfigurationException in case of configuration errors */ - private List lookupInterceptorReference(PackageConfig.Builder context, Element interceptorRefElement) throws ConfigurationException { + protected List lookupInterceptorReference(PackageConfig.Builder context, Element interceptorRefElement) throws ConfigurationException { String refName = interceptorRefElement.getAttribute("name"); Map refParams = XmlHelper.getParams(interceptorRefElement);