diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java index fc92028..8308fd1 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java @@ -12,6 +12,7 @@ import javax.xml.bind.annotation.XmlType; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.hibernate.validator.constraints.Email; @@ -116,6 +117,7 @@ public void setEnabled(boolean enabled) { } @XmlElement(name = "role", namespace = Namespaces.ZANATA_OLD) + @JsonProperty("roles") public Set getRoles() { return roles; } @@ -125,6 +127,7 @@ public void setRoles(Set roles) { } @XmlElement(name = "tribe", namespace = Namespaces.ZANATA_OLD) + @JsonProperty("tribes") public Set getTribes() { return tribes; } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java index e3448c7..3252b0e 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlType; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.zanata.common.Namespaces; @@ -64,6 +65,7 @@ public class Glossary implements Serializable, HasMediaType { @XmlElementWrapper(name = "source-locales", required = false, namespace = Namespaces.ZANATA_OLD) @XmlElement(name = "locale", namespace = Namespaces.ZANATA_OLD) + @JsonProperty("sourceLocales") public LocaleList getSourceLocales() { return sourceLocales; } @@ -75,6 +77,7 @@ public void setSourceLocales(LocaleList sourceLocales) { @XmlElementWrapper(name = "target-locales", required = false, namespace = Namespaces.ZANATA_OLD) @XmlElement(name = "locale", namespace = Namespaces.ZANATA_OLD) + @JsonProperty("targetLocales") public LocaleList getTargetLocales() { return targetLocales; } @@ -86,6 +89,7 @@ public void setTargetLocales(LocaleList targetLocales) { @XmlElementWrapper(name = "glossary-entries", namespace = Namespaces.ZANATA_OLD) @XmlElement(name = "glossary-entry", namespace = Namespaces.ZANATA_OLD) + @JsonProperty("glossaryEntries") public List getGlossaryEntries() { if (glossaryEntries == null) { glossaryEntries = new ArrayList(); diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java index 8db12e0..6fc3abb 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.zanata.common.LocaleId; @@ -58,6 +59,7 @@ public class GlossaryEntry implements Serializable { private String sourcereference; @XmlElement(name = "glossary-term", namespace = Namespaces.ZANATA_OLD) + @JsonProperty("glossaryTerms") public List getGlossaryTerms() { if (glossaryTerms == null) { glossaryTerms = new ArrayList(); @@ -71,6 +73,7 @@ public void setGlossaryTerms(List glossaryTerms) { @XmlAttribute(name = "src-lang") @XmlJavaTypeAdapter(type = LocaleId.class, value = LocaleIdAdapter.class) + @JsonProperty("srcLang") public LocaleId getSrcLang() { return srcLang; } @@ -81,6 +84,7 @@ public void setSrcLang(LocaleId srcLang) { @XmlElement(name = "source-reference", required = false, namespace = Namespaces.ZANATA_OLD) + @JsonProperty("sourcereference") public String getSourcereference() { return sourcereference; } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java index 7052b9a..997151d 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java @@ -31,6 +31,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.zanata.common.LocaleId; @@ -61,6 +62,7 @@ public class GlossaryTerm implements Serializable { @XmlAttribute(name = "lang", namespace = Namespaces.XML) @XmlJavaTypeAdapter(type = LocaleId.class, value = LocaleIdAdapter.class) + @JsonProperty("locale") public LocaleId getLocale() { return locale; } @@ -80,6 +82,7 @@ public void setContent(String content) { } @XmlElement(name = "comment", namespace = Namespaces.ZANATA_OLD) + @JsonProperty("comments") public List getComments() { if (comments == null) { comments = new ArrayList(); diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java index f2b9625..dd9567c 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java @@ -9,6 +9,7 @@ import javax.xml.bind.annotation.XmlType; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.hibernate.validator.constraints.Email; @@ -65,6 +66,7 @@ public void setName(String name) { */ @XmlElement(name = "link", required = false, namespace = Namespaces.ZANATA_OLD) + @JsonProperty("links") public Links getLinks() { return links; } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java index dca6b6d..74011b9 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/ProcessStatus.java @@ -29,6 +29,8 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import org.codehaus.jackson.annotate.JsonProperty; + /** * Generic type to represent the status of a process. * @@ -84,6 +86,7 @@ public void setPercentageComplete(int percentageComplete) { @XmlElement(name = "message") @XmlElementWrapper(name = "messages", required = true) + @JsonProperty("messages") public List getMessages() { if (messages == null) { messages = new ArrayList(); diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java index 0694981..8303ace 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java @@ -15,6 +15,7 @@ import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; @@ -131,6 +132,7 @@ public void setSourceCheckoutURL(String sourceCheckoutURL) { } @XmlElement(name = "link", namespace = Namespaces.ZANATA_API) + @JsonProperty("links") public Links getLinks() { return links; } @@ -149,6 +151,7 @@ public Links getLinks(boolean createIfNull) { @XmlElementWrapper(name = "project-iterations", namespace = Namespaces.ZANATA_OLD) @XmlElementRef(namespace = Namespaces.ZANATA_OLD) + @JsonProperty("iterations") public List getIterations() { return iterations; } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java index 1419464..50461a6 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java @@ -30,6 +30,7 @@ import javax.xml.bind.annotation.XmlType; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; @@ -81,6 +82,7 @@ public void setId(String id) { */ @XmlElement(name = "link", required = false, namespace = Namespaces.ZANATA_OLD) + @JsonProperty("links") public Links getLinks() { return links; } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/AbstractResourceMeta.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/AbstractResourceMeta.java index c15e903..0252370 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/AbstractResourceMeta.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/AbstractResourceMeta.java @@ -9,6 +9,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import org.codehaus.jackson.annotate.JsonIgnore; +import org.codehaus.jackson.annotate.JsonProperty; import org.zanata.common.ContentType; import org.zanata.common.LocaleId; import org.zanata.common.Namespaces; @@ -88,6 +89,7 @@ public void setLang(LocaleId lang) { @XmlJavaTypeAdapter(type = ContentType.class, value = ContentTypeAdapter.class) @XmlAttribute(name = "content-type", required = true) + @JsonProperty("contentType") public ContentType getContentType() { return contentType; } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java index 360005f..f31cd4c 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java @@ -9,6 +9,7 @@ import javax.xml.bind.annotation.XmlType; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.zanata.common.Namespaces; @@ -35,6 +36,7 @@ public Resource(String name) { namespace = Namespaces.ZANATA_OLD) @XmlElement(name = "text-flow", namespace = org.zanata.common.Namespaces.ZANATA_API) + @JsonProperty("textFlows") public List getTextFlows() { if (textFlows == null) { textFlows = new ArrayList(); diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java index 11cfe05..8cc7eff 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java @@ -9,6 +9,7 @@ import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.hibernate.validator.constraints.NotEmpty; @@ -46,6 +47,7 @@ public TextFlowTarget(String resId) { } @XmlElement(name = "person", namespace = Namespaces.ZANATA_API) + @JsonProperty("translator") public Person getTranslator() { return translator; } @@ -109,6 +111,7 @@ public void setExtensions(ExtensionSet extensions) { @XmlAttribute(name = "res-id", required = true) @NotEmpty + @JsonProperty("resId") public String getResId() { return resId; } diff --git a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java index ee90eef..c90fdce 100644 --- a/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java +++ b/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java @@ -12,6 +12,7 @@ import org.codehaus.jackson.annotate.JsonIgnore; import org.codehaus.jackson.annotate.JsonIgnoreProperties; +import org.codehaus.jackson.annotate.JsonProperty; import org.codehaus.jackson.annotate.JsonPropertyOrder; import org.codehaus.jackson.map.annotate.JsonSerialize; import org.zanata.common.Namespaces; @@ -62,6 +63,7 @@ public ExtensionSet getExtensions( @XmlElementWrapper(name = "targets", required = false, namespace = Namespaces.ZANATA_OLD) @XmlElement(name = "text-flow-target", namespace = Namespaces.ZANATA_API) + @JsonProperty("textFlowTargets") public List getTextFlowTargets() { if (textFlowTargets == null) { textFlowTargets = new ArrayList();