package com.creatubbles.api.core;

import com.creatubbles.api.request.auth.OAuthAccessTokenRequest;

public class User {
    public String id, age, birth_month, birth_year;
    public String username, display_name, email, country, role;
    public boolean is_teacher, is_loggable, is_site_admin, newsletter;
    public int signed_up_as;
    
    /**
     * @see OAuthAccessTokenRequest
     */
    @Deprecated
    public String access_token;
    
    /**
     * @see OAuthAccessTokenRequest
     */
    @Deprecated
    public String password;

    @Override
    public int hashCode() {
        final int prime = 31;
        int result = 1;
        result = prime * result + id.hashCode();
        result = prime * result + ((username == null) ? 0 : username.hashCode());
        return result;
    }

    @Override
    public boolean equals(Object obj) {
        if (this == obj) {
            return true;
        }
        if (obj == null) {
            return false;
        }
        if (getClass() != obj.getClass()) {
            return false;
        }
        User other = (User) obj;
        if (id == null && other.id != null) {
            return false;
        } else if (!id.equals(other.id)) {
            return false;
        }
        if (username == null && other.username != null) {
            return false;
        } else if (!username.equals(other.username)) {
            return false;
        }
        return true;
    }
}

@@ -219,21 +219,111 @@
 il, 
-country, role
+role;%0A    public String country_code, country_name;%0A    public String created_at, short_url, avatar_url
 ;%0A  
@@ -338,16 +338,25 @@
  boolean
+ is_male,
  is_teac
@@ -399,16 +399,33 @@
 sletter;
+%0A%0A    @Deprecated
 %0A    pub
@@ -445,16 +445,128 @@
 d_up_as;
+%0A%0A    /**%0A     * @see #country_code%0A     * @see #country_name%0A     */%0A    @Deprecated%0A    public String country;
 %0A    %0A  

Add some missing fields to User