Skip to content

Use JsonProperty for non-attribute members in XML models #137

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
RikkiGibson merged 1 commit into from
Feb 12, 2018
Merged

Use JsonProperty for non-attribute members in XML models #137

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
21 changes: 14 additions & 7 deletions src/JavaCodeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1613,7 +1613,16 @@ private static ServiceModel ParseModel(AutoRestCompositeType autoRestCompositeTy
if (settings.ShouldGenerateXmlSerialization)
{
modelImports.Add("com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement");
modelImports.Add("com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty");

if (compositeTypeProperties.Any(p => p.XmlIsAttribute))
{
modelImports.Add("com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty");
}

if (compositeTypeProperties.Any(p => !p.XmlIsAttribute))
{
modelImports.Add("com.fasterxml.jackson.annotation.JsonProperty");
}

if (compositeTypeProperties.Any(p => p.ModelType is AutoRestSequenceType))
{
Expand Down Expand Up @@ -2453,12 +2462,10 @@ public static JavaFile GetModelJavaFile(ServiceModel model, JavaSettings setting
{
classBlock.Annotation("HeaderCollection(\"" + property.HeaderCollectionPrefix + "\")");
}
else if (settings.ShouldGenerateXmlSerialization)
else if (settings.ShouldGenerateXmlSerialization && property.IsXmlAttribute)
{
string localName = settings.ShouldGenerateXmlSerialization ? property.XmlName : property.SerializedName;
classBlock.Annotation(property.IsXmlAttribute
? $"JacksonXmlProperty(localName = \"{localName}\", isAttribute = true)"
: $"JacksonXmlProperty(localName = \"{localName}\")");
classBlock.Annotation($"JacksonXmlProperty(localName = \"{localName}\", isAttribute = true)");
}
else if (!string.IsNullOrEmpty(property.AnnotationArguments))
{
Expand Down Expand Up @@ -2739,7 +2746,7 @@ public static JavaFile GetEnumJavaFile(EnumType serviceEnum, JavaSettings settin

enumBlock.JavadocComment($"The actual serialized value for a {serviceEnum.Name} instance.");
enumBlock.PrivateFinalMemberVariable("String", "value");

enumBlock.PrivateConstructor($"{serviceEnum.Name}(String value)", (constructor) =>
{
constructor.Line("this.value = value;");
Expand All @@ -2764,7 +2771,7 @@ public static JavaFile GetEnumJavaFile(EnumType serviceEnum, JavaSettings settin
});
function.Return("null");
});

enumBlock.Annotation("JsonValue",
"Override");
enumBlock.PublicMethod("String toString()", (function) =>
Expand Down