Skip to content

Fix gh-11899: Default addLocationInformation to false in Settings and Toolchains XML writers #11984

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
abhu85 wants to merge 1 commit into
base: master
Choose a base branch
from
+28 −4
Open

Fix gh-11899: Default addLocationInformation to false in Settings and Toolchains XML writers #11984

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
16 changes: 14 additions & 2 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsXmlFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.io.OutputStream;
import java.io.Reader;
import java.io.Writer;
import java.util.function.Function;

import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.di.Named;
Expand All @@ -31,6 +32,7 @@
import org.apache.maven.api.services.xml.XmlReaderRequest;
import org.apache.maven.api.services.xml.XmlWriterException;
import org.apache.maven.api.services.xml.XmlWriterRequest;
import org.apache.maven.api.settings.InputLocation;
import org.apache.maven.api.settings.InputSource;
import org.apache.maven.api.settings.Settings;
import org.apache.maven.settings.v4.SettingsStaxReader;
Expand Down Expand Up @@ -79,10 +81,20 @@ public void write(XmlWriterRequest<Settings> request) throws XmlWriterException
throw new IllegalArgumentException("writer or outputStream must be non null");
}
try {
SettingsStaxWriter xmlWriter = new SettingsStaxWriter();
xmlWriter.setAddLocationInformation(false);

Function<Object, String> formatter = request.getInputLocationFormatter();
if (formatter != null) {
xmlWriter.setAddLocationInformation(true);
Function<InputLocation, String> adapter = formatter::apply;
xmlWriter.setStringFormatter(adapter);
}

if (writer != null) {
new SettingsStaxWriter().write(writer, content);
xmlWriter.write(writer, content);
} else {
new SettingsStaxWriter().write(outputStream, content);
xmlWriter.write(outputStream, content);
}
} catch (Exception e) {
throw new XmlWriterException("Unable to write settings: " + getMessage(e), getLocation(e), e);
Expand Down
16 changes: 14 additions & 2 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultToolchainsXmlFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import java.io.Reader;
import java.io.Writer;
import java.util.Objects;
import java.util.function.Function;

import org.apache.maven.api.annotations.Nonnull;
import org.apache.maven.api.di.Named;
Expand All @@ -32,6 +33,7 @@
import org.apache.maven.api.services.xml.XmlReaderRequest;
import org.apache.maven.api.services.xml.XmlWriterException;
import org.apache.maven.api.services.xml.XmlWriterRequest;
import org.apache.maven.api.toolchain.InputLocation;
import org.apache.maven.api.toolchain.InputSource;
import org.apache.maven.api.toolchain.PersistedToolchains;
import org.apache.maven.toolchain.v4.MavenToolchainsStaxReader;
Expand Down Expand Up @@ -81,10 +83,20 @@ public void write(XmlWriterRequest<PersistedToolchains> request) throws XmlWrite
throw new IllegalArgumentException("writer or outputStream must be non null");
}
try {
MavenToolchainsStaxWriter xmlWriter = new MavenToolchainsStaxWriter();
xmlWriter.setAddLocationInformation(false);

Function<Object, String> formatter = request.getInputLocationFormatter();
if (formatter != null) {
xmlWriter.setAddLocationInformation(true);
Function<InputLocation, String> adapter = formatter::apply;
xmlWriter.setStringFormatter(adapter);
}

if (writer != null) {
new MavenToolchainsStaxWriter().write(writer, content);
xmlWriter.write(writer, content);
} else {
new MavenToolchainsStaxWriter().write(outputStream, content);
xmlWriter.write(outputStream, content);
}
} catch (Exception e) {
throw new XmlWriterException("Unable to write toolchains: " + getMessage(e), getLocation(e), e);
Expand Down