Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-07 15:46:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

WW-5293 Make more methods overridable

Browse Source
This commit is contained in:
Kusal Kithul-Godage
2023-03-18 12:16:38 +11:00
parent 4bc790dd50
commit bd805cd686
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlConfigurationProvider.java
+6 -6
View File
@@ -67,7 +67,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid
private final String configFileName;
private final Set<String> loadedFileUrls = new HashSet<>();
private Set<String> 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<Document> parseFile(String configFileName) {
protected List<Document> parseFile(String configFileName) {
try {
loadedFileUrls.clear();
return loadConfigurationFiles(configFileName, null);
@@ -131,7 +131,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid
}
}
private List<Document> loadConfigurationFiles(String fileName, Element includeElement) {
protected List<Document> 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<URL> getURLs(String fileName) {
protected Iterator<URL> getURLs(String fileName) {
Iterator<URL> 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<Document> getDocs(Iterator<URL> urls, String fileName, Element includeElement) {
protected List<Document> getDocs(Iterator<URL> urls, String fileName, Element includeElement) {
List<Document> docs = new ArrayList<>();
while (urls.hasNext()) {
@@ -204,7 +204,7 @@ public abstract class XmlConfigurationProvider extends XmlDocConfigurationProvid
return docs;
}
private List<Document> getFinalDocs(List<Document> docs) {
protected List<Document> getFinalDocs(List<Document> docs) {
List<Document> finalDocs = new ArrayList<>();
docs.sort(Comparator.comparing(XmlHelper::getLoadOrder));
for (Document doc : docs) {
core/src/main/java/com/opensymphony/xwork2/config/providers/XmlDocConfigurationProvider.java
+1 -1
View File
@@ -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<InterceptorMapping> lookupInterceptorReference(PackageConfig.Builder context, Element interceptorRefElement) throws ConfigurationException {
protected List<InterceptorMapping> lookupInterceptorReference(PackageConfig.Builder context, Element interceptorRefElement) throws ConfigurationException {
String refName = interceptorRefElement.getAttribute("name");
Map<String, String> refParams = XmlHelper.getParams(interceptorRefElement);