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