Commit a150bced by Tuomas Riihimäki

Remove name fields from XMLElement annotations. gson does not parse them correct…

…ly and android app explodes..
1 parent e101c7ce
......@@ -12,17 +12,17 @@ public class MapPojo {
super();
}
@XmlElement(name = "name")
@XmlElement()
public String getName() {
return name;
}
@XmlElement(name = "id")
@XmlElement()
public Integer getId() {
return id;
}
@XmlElement(name = "active")
@XmlElement()
public boolean isActive() {
return active;
}
......
......@@ -40,40 +40,40 @@ public class EventUserRestPojo {
@XmlElement(name = "nick")
@XmlElement()
@ApiModelProperty("Nickname")
public String getNick() {
return nick;
}
@XmlElement(name = "login")
@XmlElement()
@ApiModelProperty("Login name")
public String getLogin()
{
return login;
}
@XmlElement(name = "eventuserId")
@XmlElement()
@ApiModelProperty("EventUser entity ID")
public Integer getEventuserId()
{
return eventuserId;
}
@XmlElement(name = "userId")
@XmlElement()
@ApiModelProperty("User entity ID")
public Integer getuserId()
{
return getUserId();
}
@XmlElement(name = "firstname")
@XmlElement()
@ApiModelProperty("First name")
public String getFirstname() {
return firstname;
}
@XmlElement(name = "lastname")
@XmlElement()
@ApiModelProperty("Last name")
public String getLastname() {
return lastname;
......
......@@ -39,35 +39,35 @@ public class PrintedCardRestPojo {
super();
}
@XmlElement(name = "eventuserId")
@XmlElement()
public Integer getEventuserId() {
return eventuserId;
}
@XmlElement(name = "cardId")
@XmlElement()
public Integer getId() {
return id;
}
@XmlElement(name = "cardTemplate")
@XmlElement()
public String getTemplate() {
return template;
}
@XmlElement(name = "username")
@XmlElement()
public String getUsername()
{
return username;
}
@XmlElement(name = "wholeName")
@XmlElement()
public String getWholeName() {
return wholeName;
}
/**
* Possible values: ( from CardState )
* Possible values: ( from CardState )
*
* <ul>
* <li>DATA_MISSING,
......@@ -79,12 +79,12 @@ public class PrintedCardRestPojo {
* <li>DELIVERED;
* </ul>
*/
@XmlElement(name = "state")
@XmlElement()
public String getState() {
return state;
}
@XmlElement(name = "printTime")
@XmlElement()
public Date getPrintTime() {
return printTime;
}
......
......@@ -53,9 +53,9 @@ public class UserPermissionRestPojo {
this.user = user;
}
@XmlElement(name = "user")
@XmlElement()
private EventUserRestPojo user;
@XmlElement(name = "accessGranted")
@XmlElement()
private boolean accessGranted = false;
}
......@@ -4,15 +4,15 @@ import javax.xml.bind.annotation.XmlElement;
public class UserReservationPlacePojo {
@XmlElement(name = "placeid")
@XmlElement()
private Integer placeid;
@XmlElement(name = "placename")
@XmlElement()
private String placename;
@XmlElement(name = "placegiven")
@XmlElement()
private boolean placegiven;
@XmlElement(name = "productId")
@XmlElement()
private Integer productId;
@XmlElement(name = "productName")
@XmlElement()
private String productName;
public String getPlacename() {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!