Skip to content
Snippets Groups Projects
Commit aef8c513 authored by Léo Banno-Cloutier's avatar Léo Banno-Cloutier
Browse files

change Expose annotation to transient

Change-Id: I2adb33f1e032d0604f6ee7a39e02ea194e78e55b
parent ffedb2b3
No related branches found
No related tags found
No related merge requests found
......@@ -23,7 +23,6 @@
package net.jami.jams.common.objects.contacts;
import com.google.gson.annotations.Expose;
import lombok.EqualsAndHashCode;
import lombok.Getter;
......@@ -41,8 +40,7 @@ import java.sql.ResultSet;
@EqualsAndHashCode
public class Contact implements DatabaseObject {
@Expose(serialize = false)
private String owner;
private transient String owner;
private String uri;
private String displayName;
......
......@@ -22,7 +22,6 @@
*/
package net.jami.jams.common.objects.devices;
import com.google.gson.annotations.Expose;
import lombok.AllArgsConstructor;
import lombok.Getter;
......@@ -44,8 +43,7 @@ public class Device extends X509Entity implements DatabaseObject {
private String deviceId;
@Expose(serialize = false)
private String owner;
private transient String owner;
private String displayName;
......
......@@ -27,8 +27,6 @@ import lombok.Setter;
import org.bouncycastle.pkcs.PKCS10CertificationRequest;
import com.google.gson.annotations.Expose;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
......@@ -36,8 +34,7 @@ import java.security.cert.X509Certificate;
@Setter
public class X509Entity {
private X509Certificate certificate;
@Expose(serialize = false)
private PrivateKey privateKey;
private transient PrivateKey privateKey;
// These can be null because they are only used if this is a request.
private X509Fields x509Fields;
private PKCS10CertificationRequest certificationRequest;
......
......@@ -36,8 +36,6 @@ import net.jami.jams.common.utils.X509Utils;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import com.google.gson.annotations.Expose;
@AllArgsConstructor
@NoArgsConstructor
@Getter
......@@ -45,18 +43,15 @@ import com.google.gson.annotations.Expose;
public class User extends X509Entity implements BlockchainEntity, DatabaseObject {
private String username;
@Expose(serialize = false)
private String password;
private transient String password;
private AuthenticationSourceType userType;
private String realm; // sort of the domain.
private AccessLevel accessLevel = AccessLevel.USER;
private Boolean needsPasswordReset = false;
@Expose(serialize = false)
private String salt;
private transient String salt;
private String ethAddress;
@Expose(serialize = false)
private String ethKey;
private transient String ethKey;
private String jamiId;
public User(ResultSet rs) throws Exception {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment