Use InputSource.toApiSource

apache · Oct 20, 2023 · b93730b · b93730b
1 parent 10f28ab
commit b93730b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 22 deletions.
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java b/maven-model-builder/src/main/java/org/apache/maven/model/io/DefaultModelReader.java
@@ -110,12 +110,7 @@ private Model read(InputStream input, Path pomFile, Map<String, ?> options) thro
             boolean strict = isStrict(options);
             MavenStaxReader mr = new MavenStaxReader();
             mr.setAddLocationInformation(source != null);
-            Model model = new Model(mr.read(
-                    parser,
-                    strict,
-                    source != null
-                            ? new org.apache.maven.api.model.InputSource(source.getModelId(), source.getLocation())
-                            : null));
+            Model model = new Model(mr.read(parser, strict, source != null ? source.toApiSource() : null));
             return model;
         } catch (XMLStreamException e) {
             Location location = e.getLocation();
@@ -139,10 +134,7 @@ private Model read(Reader reader, Path pomFile, Map<String, ?> options) throws I
             boolean strict = isStrict(options);
             MavenStaxReader mr = new MavenStaxReader();
             mr.setAddLocationInformation(source != null);
-            Model model = new Model(mr.read(
-                    parser,
-                    strict,
-                    new org.apache.maven.api.model.InputSource(source.getModelId(), source.getLocation())));
+            Model model = new Model(mr.read(parser, strict, source != null ? source.toApiSource() : null));
             return model;
         } catch (XMLStreamException e) {
             Location location = e.getLocation();

diff --git a/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java b/maven-model/src/main/java/org/apache/maven/model/io/xpp3/MavenXpp3Reader.java
@@ -70,12 +70,8 @@ public void setAddDefaultEntities(boolean addDefaultEntities) {
 
     protected Model read(Reader reader, boolean strict, InputSource source) throws IOException, XmlPullParserException {
         try {
-            org.apache.maven.api.model.Model model = delegate.read(
-                    reader,
-                    strict,
-                    source != null
-                            ? new org.apache.maven.api.model.InputSource(source.getModelId(), source.getLocation())
-                            : null);
+            org.apache.maven.api.model.Model model =
+                    delegate.read(reader, strict, source != null ? source.toApiSource() : null);
             return new Model(model);
         } catch (XMLStreamException e) {
             throw new XmlPullParserException(e.getMessage(), null, e);
@@ -110,12 +106,8 @@ public Model read(Reader reader) throws IOException, XmlPullParserException {
     protected Model read(InputStream is, boolean strict, InputSource source)
             throws IOException, XmlPullParserException {
         try {
-            org.apache.maven.api.model.Model model = delegate.read(
-                    is,
-                    strict,
-                    source != null
-                            ? new org.apache.maven.api.model.InputSource(source.getModelId(), source.getLocation())
-                            : null);
+            org.apache.maven.api.model.Model model =
+                    delegate.read(is, strict, source != null ? source.toApiSource() : null);
             return new Model(model);
         } catch (XMLStreamException e) {
             throw new XmlPullParserException(e.getMessage(), null, e);