Skip to content

Fix @attribute prefix ignored in array elements #52

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

Merged
gnodet merged 1 commit into from
Jun 23, 2026
Merged

Fix @attribute prefix ignored in array elements #52

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
38 changes: 24 additions & 14 deletions extension/src/main/java/eu/maveniverse/maven/mason/JsonReaderHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,46 +231,56 @@ public static XmlNode buildXmlNode(JsonParser parser, InputSource inputSrc, bool
// Skip the wrapper field, use its contents directly
token = parser.nextToken(); // Move to the start of inner object
if (token == JsonToken.START_OBJECT) {
Map<String, String> objAttributes = new LinkedHashMap<>();
List<XmlNode> objectChildren = new ArrayList<>();
while ((token = parser.nextToken()) != JsonToken.END_OBJECT) {
if (token == JsonToken.FIELD_NAME) {
String objFieldName = parser.currentName();
token = parser.nextToken();
objectChildren.add(XmlNode.newInstance(
objFieldName,
parser.getText(),
new LinkedHashMap<>(),
new ArrayList<>(),
createLocation(parser, inputSrc, addLocationInformation)));
if (objFieldName.startsWith("@")) {
objAttributes.put(objFieldName.substring(1), parser.getText());
} else {
objectChildren.add(XmlNode.newInstance(
objFieldName,
parser.getText(),
new LinkedHashMap<>(),
new ArrayList<>(),
createLocation(parser, inputSrc, addLocationInformation)));
}
}
}
parser.nextToken(); // Skip the outer object's END_OBJECT
arrayChildren.add(XmlNode.newInstance(
singularName,
null,
new LinkedHashMap<>(),
objAttributes,
objectChildren,
createLocation(parser, inputSrc, addLocationInformation)));
}
} else {
// Regular object, process its fields
Map<String, String> objAttributes = new LinkedHashMap<>();
List<XmlNode> objectChildren = new ArrayList<>();
parser.currentName(); // Reset to first field
while (token == JsonToken.FIELD_NAME) {
String objFieldName = parser.currentName();
token = parser.nextToken();
objectChildren.add(XmlNode.newInstance(
objFieldName,
parser.getText(),
new LinkedHashMap<>(),
new ArrayList<>(),
createLocation(parser, inputSrc, addLocationInformation)));
if (objFieldName.startsWith("@")) {
objAttributes.put(objFieldName.substring(1), parser.getText());
} else {
objectChildren.add(XmlNode.newInstance(
objFieldName,
parser.getText(),
new LinkedHashMap<>(),
new ArrayList<>(),
createLocation(parser, inputSrc, addLocationInformation)));
}
token = parser.nextToken();
}
arrayChildren.add(XmlNode.newInstance(
singularName,
null,
new LinkedHashMap<>(),
objAttributes,
objectChildren,
createLocation(parser, inputSrc, addLocationInformation)));
}
Expand Down
54 changes: 54 additions & 0 deletions extension/src/test/java/eu/maveniverse/maven/mason/YamlParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,60 @@ void testBuildPlugins() throws Exception {
assertModelEquals(expected, actual);
}

@Test
void testBuildPluginConfigAttributes() throws Exception {
Model actual = loadAndParse("build-plugin-config-attributes.yaml");
Model expected = Model.newBuilder()
.modelVersion("4.0.0")
.groupId("org.apache.maven.extensions")
.artifactId("maven-yaml-extension")
.version("1.0.0-SNAPSHOT")
.name("Maven YAML Extension")
.build(Build.newBuilder()
.plugins(List.of(Plugin.newBuilder()
.groupId("org.apache.maven.plugins")
.artifactId("maven-shade-plugin")
.version("3.5.0")
.configuration(XmlNode.newInstance(
"configuration",
null,
null,
List.of(XmlNode.newInstance(
"transformers",
null,
null,
List.of(
XmlNode.newInstance(
"transformer",
null,
Map.of(
"implementation",
"org.apache.maven.plugins.shade.resource.ManifestResourceTransformer"),
List.of(
XmlNode.newInstance(
"mainClass",
"com.example.Main",
null,
null,
null)),
null),
XmlNode.newInstance(
"transformer",
null,
Map.of(
"implementation",
"org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"),
null,
null)),
null)),
null))
.build()))
.build())
.build();

assertModelEquals(expected, actual);
}

@Test
void testBuildExtensions() throws Exception {
Model actual = loadAndParse("build-extensions.yaml");
Expand Down
23 changes: 23 additions & 0 deletions extension/src/test/resources/yaml/build-plugin-config-attributes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
##
## Copyright (c) 2025 Guillaume Nodet
##
## This program and the accompanying materials are made available under
## the terms of the Eclipse Public License 2.0 which accompanies this
## distribution and is available at:
## https://www.eclipse.org/legal/epl-2.0/
##
## SPDX-License-Identifier: EPL-2.0
##
modelVersion: 4.0.0
groupId: org.apache.maven.extensions
artifactId: maven-yaml-extension
version: 1.0.0-SNAPSHOT
name: Maven YAML Extension
build:
plugins:
- id: org.apache.maven.plugins:maven-shade-plugin:3.5.0
configuration:
transformers:
- "@implementation": org.apache.maven.plugins.shade.resource.ManifestResourceTransformer
mainClass: com.example.Main
- "@implementation": org.apache.maven.plugins.shade.resource.ServicesResourceTransformer
Loading