Skip to content

set-property should add the property if it does not yet exist #1340

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

Open
mandritschke wants to merge 1 commit into
base: master
Choose a base branch
from
Open

set-property should add the property if it does not yet exist #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
70 changes: 18 additions & 52 deletions versions-common/src/main/java/org/codehaus/mojo/versions/api/PomHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@
import org.apache.maven.project.ProjectBuildingResult;
import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.mojo.versions.rewriting.MutableXMLStreamReader;
import org.codehaus.mojo.versions.rewriting.PropertyVersionInternal;
import org.codehaus.mojo.versions.utils.ArtifactFactory;
import org.codehaus.mojo.versions.utils.ModelNode;
import org.codehaus.mojo.versions.utils.RegexUtils;
Expand Down Expand Up @@ -224,59 +225,24 @@ public static Model getRawModel(Reader reader) throws IOException {
*/
public static boolean setPropertyVersion(
MutableXMLStreamReader pom, String profileId, String property, String value) throws XMLStreamException {
class PropertyVersionInternal {
final Pattern propertyRegex = Pattern.compile(
(profileId == null ? "/project/properties/" : "/project/profiles/profile/properties/")
+ RegexUtils.quote(property));
final Pattern matchScopeRegex = profileId == null
? Pattern.compile("/project/properties")
: Pattern.compile("/project/profiles/profile");
final Pattern profileIdRegex = profileId == null ? null : Pattern.compile("/project/profiles/profile/id");

boolean setPropertyVersion(String path, boolean inMatchScope) throws XMLStreamException {
boolean replaced = false;
while (!replaced && pom.hasNext()) {
pom.next();
if (pom.isStartElement()) {
String elementPath = path + "/" + pom.getLocalName();
if (propertyRegex.matcher(elementPath).matches()) {
pom.mark(START);
} else if (matchScopeRegex.matcher(elementPath).matches()) {
// we're in a new match scope -> reset any previous partial matches
inMatchScope = profileId == null;
pom.clearMark(START);
pom.clearMark(END);
} else if (profileId != null
&& profileIdRegex.matcher(elementPath).matches()) {
inMatchScope =
profileId.trim().equals(pom.getElementText().trim());
}

// getElementText could've pushed the pointer to END_ELEMENT
if (!pom.isEndElement()) {
// inMatchScope will not change in the child element
replaced = setPropertyVersion(elementPath, inMatchScope);
}
} else if (pom.isEndElement()) {
if (propertyRegex.matcher(path).matches()) {
pom.mark(END);
} else if (matchScopeRegex.matcher(path).matches()) {
if (inMatchScope && pom.hasMark(START) && pom.hasMark(END)) {
pom.replaceBetween(START, END, value);
replaced = true;
}
pom.clearMark(START);
pom.clearMark(END);
}
return replaced;
}
}
return replaced;
}
}
return setPropertyVersion(pom, profileId, property, value, false);
}

pom.rewind();
return new PropertyVersionInternal().setPropertyVersion("", false);
/**
* Searches the pom re-defining the specified property to the specified version.
*
* @param pom The pom to modify.
* @param profileId The profile in which to modify the property.
* @param property The property to modify.
* @param value The new value of the property.
* @param insert Whether to insert a new property or just replace an existing one.
* @return <code>true</code> if a replacement was made.
* @throws XMLStreamException if somethinh went wrong.
*/
public static boolean setPropertyVersion(
MutableXMLStreamReader pom, String profileId, String property, String value, boolean insert)
throws XMLStreamException {
return new PropertyVersionInternal(pom, profileId, property, value).update(insert);
}

/**
Expand Down
34 changes: 34 additions & 0 deletions ...ons-common/src/main/java/org/codehaus/mojo/versions/rewriting/MutableXMLStreamReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

import org.apache.maven.shared.utils.io.IOUtil;
import org.codehaus.stax2.LocationInfo;
Expand All @@ -44,6 +46,7 @@
*/
public class MutableXMLStreamReader extends StreamReader2Delegate implements AutoCloseable {
private static final XMLInputFactory FACTORY = XMLInputFactory2.newInstance();
private static final Pattern INDENTATION_PATTERN = Pattern.compile("^(\\s+)<", Pattern.MULTILINE);

private StringBuilder source;

Expand Down Expand Up @@ -386,4 +389,35 @@ public String toString() {
return "MarkInfo[" + getStart() + ":" + getEnd() + "]";
}
}

/**
* Determine the line separator.
*
* @return line separator
*/
public String getLineSeparator() {
String text = getSource();
if (text.contains("\r\n")) {
return "\r\n";
}
if (text.contains("\r")) {
return "\r";
}
return "\n";
}

/**
* Determine the indentation.
*
* @return indentation
*/
public String getIndentation() {
Pattern indentPattern = INDENTATION_PATTERN;
Matcher matcher = indentPattern.matcher(getSource());

if (matcher.find()) {
return matcher.group(1);
}
return "";
}
}
Loading