Skip to content

SimpleRegexFileFilter #144

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
umefjord wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

SimpleRegexFileFilter #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f918535
Fixes #141
Aug 6, 2019
518886d
Fixes #141, additional fixes
Aug 7, 2019
5616955
Better fix for #141
Aug 15, 2019
27dc57e
Adding additional file filter to add more flexibility to what files a…
Aug 8, 2019
3bc5642
Fix for #146 by adding a namespace prefix in references to types in t…
Aug 20, 2019
8916ae2
Additional fix for #146. Takes care of the non-transformed prefixes t…
Sep 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 19 additions & 15 deletions src/main/java/org/codehaus/mojo/jaxb2/schemageneration/XsdGeneratorHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,22 +286,26 @@ public static void replaceNamespacePrefixes(
final String oldPrefix = currentResolver.getNamespaceURI2PrefixMap().get(currentUri);

if (StringUtils.isNotEmpty(oldPrefix)) {
// Can we perform the prefix substitution?
validatePrefixSubstitutionIsPossible(oldPrefix, newPrefix, currentResolver);

if (mavenLog.isDebugEnabled()) {
mavenLog.debug("Subtituting namespace prefix [" + oldPrefix + "] with [" + newPrefix
+ "] in file [" + currentResolver.getSourceFilename() + "].");
}

// Get the Document of the current schema file.
if (generatedSchemaFileDocument == null) {
generatedSchemaFileDocument = parseXmlToDocument(generatedSchemaFile);
if (newPrefix.equals(oldPrefix)) {
mavenLog.warn("The namespace prefix [" + oldPrefix + "] is already present in file [" + currentResolver.getSourceFilename() + "]. Skipping substitution for this prefix.");
} else {
// Can we perform the prefix substitution?
validatePrefixSubstitutionIsPossible(oldPrefix, newPrefix, currentResolver);

if (mavenLog.isDebugEnabled()) {
mavenLog.debug("Subtituting namespace prefix [" + oldPrefix + "] with [" + newPrefix
+ "] in file [" + currentResolver.getSourceFilename() + "].");
}

// Get the Document of the current schema file.
if (generatedSchemaFileDocument == null) {
generatedSchemaFileDocument = parseXmlToDocument(generatedSchemaFile);
}

// Replace all namespace prefixes within the provided document.
process(generatedSchemaFileDocument.getFirstChild(), true,
new ChangeNamespacePrefixProcessor(oldPrefix, newPrefix));
}

// Replace all namespace prefixes within the provided document.
process(generatedSchemaFileDocument.getFirstChild(), true,
new ChangeNamespacePrefixProcessor(oldPrefix, newPrefix));
}
}
}
Expand Down
Loading