gnodet-bot commented on code in PR #13118:
URL: https://github.com/apache/maven/pull/13118#discussion_r4011029959
##########
impl/maven-impl/src/main/java/org/apache/maven/impl/DefaultSettingsBuilder.java:
##########
@@ -159,35 +167,24 @@ private Settings readSettings(
Settings settings;
try {
- try (InputStream is = settingsSource.openStream()) {
- settings = settingsXmlFactory.read(XmlReaderRequest.builder()
- .inputStream(is)
- .location(settingsSource.getLocation())
- .strict(true)
- .build());
- } catch (XmlReaderException e) {
- try (InputStream is = settingsSource.openStream()) {
- settings =
settingsXmlFactory.read(XmlReaderRequest.builder()
- .inputStream(is)
- .location(settingsSource.getLocation())
- .strict(false)
- .build());
- Location loc = e.getCause() instanceof XMLStreamException
xe ? xe.getLocation() : null;
- problems.reportProblem(new DefaultBuilderProblem(
- settingsSource.getLocation(),
- loc != null ? loc.getLineNumber() : -1,
- loc != null ? loc.getColumnNumber() : -1,
- e,
- e.getMessage(),
- BuilderProblem.Severity.WARNING));
- }
+ SettingsParser parser = selectParser(settingsSource);
+ try {
+ settings = parser.parse(settingsSource,
Map.of(SettingsParser.STRICT, true));
+ } catch (SettingsParserException e) {
+ settings = parser.parse(settingsSource,
Map.of(SettingsParser.STRICT, false));
+ problems.reportProblem(new DefaultBuilderProblem(
+ settingsSource.getLocation(),
+ e.getLineNumber(),
+ e.getColumnNumber(),
+ e,
+ e.getMessage(),
+ BuilderProblem.Severity.WARNING));
}
- } catch (XmlReaderException e) {
- Location loc = e.getCause() instanceof XMLStreamException xe ?
xe.getLocation() : null;
+ } catch (SettingsParserException e) {
problems.reportProblem(new DefaultBuilderProblem(
settingsSource.getLocation(),
- loc != null ? loc.getLineNumber() : -1,
- loc != null ? loc.getColumnNumber() : -1,
+ e.getLineNumber(),
+ e.getColumnNumber(),
e,
"Non-parseable settings " + settingsSource.getLocation() +
": " + e.getMessage(),
BuilderProblem.Severity.FATAL));
Review Comment:
test selectParser comment at 183-190
##########
api/maven-api-spi/src/main/java/org/apache/maven/api/spi/SettingsParserException.java:
##########
@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.maven.api.spi;
+
+import org.apache.maven.api.annotations.Experimental;
+import org.apache.maven.api.services.MavenException;
+
+/**
+ * A syntax error in a settings source, with optional one-based line and
column numbers.
+ *
+ * @since 4.1.0
+ */
+@Experimental
+public class SettingsParserException extends MavenException {
+
+ /**
+ * The one-based index of the line containing the error.
+ */
+ private final int lineNumber;
+
+ /**
+ * The one-based index of the column containing the error.
+ */
+ private final int columnNumber;
+
+ public SettingsParserException() {
+ this(null, null);
+ }
+
+ public SettingsParserException(String message) {
+ this(message, null);
+ }
+
+ public SettingsParserException(String message, Throwable cause) {
+ this(message, -1, -1, cause);
+ }
+
+ public SettingsParserException(String message, int lineNumber, int
columnNumber, Throwable cause) {
+ super(message, cause);
+ this.lineNumber = lineNumber;
+ this.columnNumber = columnNumber;
+ }
+
+ public SettingsParserException(Throwable cause) {
+ this(null, cause);
+ }
Review Comment:
test null message
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
