Commit ecaba3eb authored by Noel Alonso's avatar Noel Alonso
Browse files

Reorganiza propiedades de dtos

parent 4c1f821a

src/main/java/es/redmic/usersettingslib/dto/PersistenceDTO.java

+35 −32
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import org.joda.time.DateTimeZone; 


import com.fasterxml.jackson.annotation.JsonIgnore;

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaDefault;

import com.kjetland.jackson.jsonSchema.annotations.JsonSchemaIgnore;



public class PersistenceDTO extends SettingsBaseDTO {
@@ -37,6 +36,7 @@ public class PersistenceDTO extends SettingsBaseDTO { 
	@JsonIgnore

	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse(

		"{\"type\":\"record\",\"name\":\"PersistenceDTO\",\"namespace\":\"es.redmic.usersettingslib.dto\",\"fields\":["

			+ "{\"name\":\"settingsId\",\"type\":[\"string\", \"null\"]},"

			+ "{\"name\":\"name\",\"type\":[\"string\", \"null\"]},"

			+ "{\"name\":\"shared\",\"type\":\"boolean\", \"default\": \"false\"},"

			+ "{\"name\":\"userId\",\"type\": \"string\"},"
@@ -54,15 +54,21 @@ public class PersistenceDTO extends SettingsBaseDTO { 
		super();

	}



	private String settingsId;



	private String name;



	@JsonSchemaDefault(value = "false")

	@NotNull

	private Boolean shared = false;



	@JsonIgnore

	@JsonSchemaIgnore

	private String userId;

	public String getSettingsId() {

		return settingsId;

	}



	public void setSettingsId(String settingsId) {

		this.settingsId = settingsId;

	}



	public String getName() {

		return name;
@@ -80,21 +86,13 @@ public class PersistenceDTO extends SettingsBaseDTO { 
		this.shared = shared;

	}



	public String getUserId() {

		return userId;

	}



	public void setUserId(String userId) {

		this.userId = userId;

	}



	@Override

	public int hashCode() {

		final int prime = 31;

		int result = super.hashCode();

		result = prime * result + ((settingsId == null) ? 0 : settingsId.hashCode());

		result = prime * result + ((name == null) ? 0 : name.hashCode());

		result = prime * result + ((shared == null) ? 0 : shared.hashCode());

		result = prime * result + ((userId == null) ? 0 : userId.hashCode());

		return result;

	}
@@ -107,6 +105,11 @@ public class PersistenceDTO extends SettingsBaseDTO { 
		if (getClass() != obj.getClass())

			return false;

		PersistenceDTO other = (PersistenceDTO) obj;

		if (settingsId == null) {

			if (other.settingsId != null)

				return false;

		} else if (!settingsId.equals(other.settingsId))

			return false;

		if (name == null) {

			if (other.name != null)

				return false;
@@ -117,11 +120,6 @@ public class PersistenceDTO extends SettingsBaseDTO { 
				return false;

		} else if (!shared.equals(other.shared))

			return false;

		if (userId == null) {

			if (other.userId != null)

				return false;

		} else if (!userId.equals(other.userId))

			return false;

		return true;

	}
@@ -136,20 +134,22 @@ public class PersistenceDTO extends SettingsBaseDTO { 
	public Object get(int field) {

		switch (field) {

		case 0:

			return getName();

			return getSettingsId();

		case 1:

			return getShared();

			return getName();

		case 2:

			return getUserId();

			return getShared();

		case 3:

			return getService();

			return getUserId();

		case 4:

			return getInserted() != null ? getInserted().getMillis() : null;

			return getService();

		case 5:

			return getUpdated() != null ? getUpdated().getMillis() : null;

			return getInserted() != null ? getInserted().getMillis() : null;

		case 6:

			return getAccessed() != null ? getAccessed().getMillis() : null;

			return getUpdated() != null ? getUpdated().getMillis() : null;

		case 7:

			return getAccessed() != null ? getAccessed().getMillis() : null;

		case 8:

			return getId();

		default:

			throw new org.apache.avro.AvroRuntimeException("Bad index");
@@ -161,27 +161,30 @@ public class PersistenceDTO extends SettingsBaseDTO { 
	public void put(int field, Object value) {

		switch (field) {

		case 0:

			setName(value != null ? value.toString() : null);

			setSettingsId(value != null ? value.toString() : null);

			break;

		case 1:

			setShared(value != null ? (boolean) value : null);

			setName(value != null ? value.toString() : null);

			break;

		case 2:

			setUserId(value != null ? value.toString() : null);

			setShared(value != null ? (boolean) value : null);

			break;

		case 3:

			setService(value.toString());

			setUserId(value != null ? value.toString() : null);

			break;

		case 4:

			setInserted(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			setService(value.toString());

			break;

		case 5:

			setUpdated(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			setInserted(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			break;

		case 6:

			setAccessed(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			setUpdated(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			break;

		case 7:

			setAccessed(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			break;

		case 8:

			setId(value.toString());

			break;

		default:

src/main/java/es/redmic/usersettingslib/dto/SelectionDTO.java

+14 −8
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ public class SelectionDTO extends SettingsBaseDTO { 
	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse(

		"{\"type\":\"record\",\"name\":\"SelectionDTO\",\"namespace\":\"es.redmic.usersettingslib.dto\",\"fields\":["

			+ "{\"name\": \"selection\",\"type\": [{\"type\": \"array\",\"items\":\"string\"},\"null\"]},"

			+ "{\"name\":\"userId\",\"type\":[\"string\", \"null\"]},"

			+ "{\"name\":\"service\",\"type\":\"string\"},"

			+ "{\"name\":\"inserted\",\"type\":[\"null\",{\"type\":\"long\",\"logicalType\":\"timestamp-millis\"}],"

				+ "\"default\": null},"
@@ -99,14 +100,16 @@ public class SelectionDTO extends SettingsBaseDTO { 
		case 0:

			return getSelection();

		case 1:

			return getService();

			return getUserId();

		case 2:

			return getInserted() != null ? getInserted().getMillis() : null;

			return getService();

		case 3:

			return getUpdated() != null ? getUpdated().getMillis() : null;

			return getInserted() != null ? getInserted().getMillis() : null;

		case 4:

			return getAccessed() != null ? getAccessed().getMillis() : null;

			return getUpdated() != null ? getUpdated().getMillis() : null;

		case 5:

			return getAccessed() != null ? getAccessed().getMillis() : null;

		case 6:

			return getId();

		default:

			throw new org.apache.avro.AvroRuntimeException("Bad index");
@@ -122,18 +125,21 @@ public class SelectionDTO extends SettingsBaseDTO { 
			setSelection(value != null ? getStringList((java.util.List) value) : null);

			break;

		case 1:

			setService(value.toString());

			setUserId(value != null ? value.toString() : null);

			break;

		case 2:

			setInserted(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			setService(value.toString());

			break;

		case 3:

			setUpdated(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			setInserted(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			break;

		case 4:

			setAccessed(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			setUpdated(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			break;

		case 5:

			setAccessed(value != null ? new DateTime(value, DateTimeZone.UTC).toDateTime() : null);

			break;

		case 6:

			setId(value.toString());

			break;

		default:

src/main/java/es/redmic/usersettingslib/dto/SettingsBaseDTO.java

+18 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ public abstract class SettingsBaseDTO extends CommonDTO { 
		super();

	}



	@JsonIgnore

	@JsonSchemaIgnore

	private String userId;



	@JsonIgnore

	@JsonSchemaIgnore

	private String service;
@@ -53,6 +57,14 @@ public abstract class SettingsBaseDTO extends CommonDTO { 
	@JsonDeserialize(using = CustomDateTimeDeserializer.class)

	DateTime accessed;



	public String getUserId() {

		return userId;

	}



	public void setUserId(String userId) {

		this.userId = userId;

	}



	public String getService() {

		return service;

	}
@@ -89,6 +101,7 @@ public abstract class SettingsBaseDTO extends CommonDTO { 
	public int hashCode() {

		final int prime = 31;

		int result = super.hashCode();

		result = prime * result + ((userId == null) ? 0 : userId.hashCode());

		result = prime * result + ((service == null) ? 0 : service.hashCode());

		result = prime * result + ((accessed == null) ? 0 : accessed.hashCode());

		result = prime * result + ((inserted == null) ? 0 : inserted.hashCode());
@@ -105,6 +118,11 @@ public abstract class SettingsBaseDTO extends CommonDTO { 
		if (getClass() != obj.getClass())

			return false;

		SettingsBaseDTO other = (SettingsBaseDTO) obj;

		if (userId == null) {

			if (other.userId != null)

				return false;

		} else if (!userId.equals(other.userId))

			return false;

		if (service == null) {

			if (other.service != null)

				return false;

src/main/java/es/redmic/usersettingslib/dto/SettingsDTO.java

+24 −21
Original line number Diff line number Diff line
@@ -41,8 +41,8 @@ public class SettingsDTO extends SettingsBaseDTO { 
		"{\"type\":\"record\",\"name\":\"SettingsDTO\",\"namespace\":\"es.redmic.usersettingslib.dto\",\"fields\":["

			+ "{\"name\":\"name\",\"type\":[\"string\", \"null\"]},"

			+ "{\"name\":\"shared\",\"type\":\"boolean\", \"default\": \"false\"},"

			+ "{\"name\":\"userId\",\"type\":[\"string\", \"null\"]},"

			+ "{\"name\": \"selection\",\"type\": [{\"type\": \"array\",\"items\":\"string\"},\"null\"]},"

			+ "{\"name\":\"userId\",\"type\":[\"string\", \"null\"]},"

			+ "{\"name\":\"service\",\"type\":\"string\"},"

			+ "{\"name\":\"inserted\",\"type\":[\"null\",{\"type\":\"long\",\"logicalType\":\"timestamp-millis\"}],"

				+ "\"default\": null},"
@@ -63,10 +63,11 @@ public class SettingsDTO extends SettingsBaseDTO { 
	@NotNull

	private Boolean shared = false;



	private String userId;



	private List<String> selection;



	@NotNull

	private String userId;



	@NotNull

	private String service;
@@ -86,14 +87,6 @@ public class SettingsDTO extends SettingsBaseDTO { 
		this.shared = shared;

	}



	public String getUserId() {

		return userId;

	}



	public void setUserId(String userId) {

		this.userId = userId;

	}



	public List<String> getSelection() {

		return selection;

	}
@@ -102,6 +95,16 @@ public class SettingsDTO extends SettingsBaseDTO { 
		this.selection = selection;

	}



	@Override

	public String getUserId() {

		return userId;

	}



	@Override

	public void setUserId(String userId) {

		this.userId = userId;

	}



	@Override

	public String getService() {

		return service;
@@ -118,9 +121,9 @@ public class SettingsDTO extends SettingsBaseDTO { 
		int result = super.hashCode();

		result = prime * result + ((name == null) ? 0 : name.hashCode());

		result = prime * result + ((selection == null) ? 0 : selection.hashCode());

		result = prime * result + ((userId == null) ? 0 : userId.hashCode());

		result = prime * result + ((service == null) ? 0 : service.hashCode());

		result = prime * result + ((shared == null) ? 0 : shared.hashCode());

		result = prime * result + ((userId == null) ? 0 : userId.hashCode());

		return result;

	}
@@ -143,6 +146,11 @@ public class SettingsDTO extends SettingsBaseDTO { 
				return false;

		} else if (!selection.equals(other.selection))

			return false;

		if (userId == null) {

			if (other.userId != null)

				return false;

		} else if (!userId.equals(other.userId))

			return false;

		if (service == null) {

			if (other.service != null)

				return false;
@@ -153,11 +161,6 @@ public class SettingsDTO extends SettingsBaseDTO { 
				return false;

		} else if (!shared.equals(other.shared))

			return false;

		if (userId == null) {

			if (other.userId != null)

				return false;

		} else if (!userId.equals(other.userId))

			return false;

		return true;

	}
@@ -176,9 +179,9 @@ public class SettingsDTO extends SettingsBaseDTO { 
		case 1:

			return getShared();

		case 2:

			return getUserId();

		case 3:

			return getSelection();

		case 3:

			return getUserId();

		case 4:

			return getService();

		case 5:
@@ -206,10 +209,10 @@ public class SettingsDTO extends SettingsBaseDTO { 
			setShared(value != null ? (boolean) value : null);

			break;

		case 2:

			setUserId(value != null ? value.toString() : null);

			setSelection(value != null ? getStringList((java.util.List) value) : null);

			break;

		case 3:

			setSelection(value != null ? getStringList((java.util.List) value) : null);

			setUserId(value != null ? value.toString() : null);

			break;

		case 4:

			setService(value.toString());