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

Añade campo value a dimension 

De esta manera podemos retornar información importante de la capa para
configurar las consultas.
parent 6d3a7575

atlas-lib/src/main/java/es/redmic/atlaslib/dto/layer/DimensionDTO.java

+30 −8
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ import org.apache.avro.Schema; 


import com.fasterxml.jackson.annotation.JsonIgnore;



public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase

		implements org.apache.avro.specific.SpecificRecord {

public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase {



	// @formatter:off
@@ -35,6 +34,7 @@ public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase 
	public static final org.apache.avro.Schema SCHEMA$ = new org.apache.avro.Schema.Parser().parse(

		"{\"type\":\"record\",\"name\":\"DimensionDTO\",\"namespace\":\"es.redmic.atlaslib.dto.layer\",\"fields\":["

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

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

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

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

				+ "{\"name\":\"defaultValue\",\"type\":\"string\"}]}");
@@ -46,6 +46,9 @@ public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase 
	@NotNull

	private String name;



	@NotNull

	private String value;



	@NotNull

	private String units;
@@ -62,6 +65,14 @@ public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase 
		this.name = name;

	}



	public String getValue() {

		return this.value;

	}



	public void setValue(String value) {

		this.value = value;

	}



	public String getUnits() {

		return units;

	}
@@ -92,6 +103,7 @@ public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase 
		int result = 1;

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

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

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

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

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

		return result;
@@ -116,6 +128,11 @@ public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase 
				return false;

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

			return false;

		if (value == null) {

			if (other.value != null)

				return false;

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

			return false;

		if (units == null) {

			if (other.units != null)

				return false;
@@ -142,10 +159,12 @@ public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase 
		case 0:

			return name;

		case 1:

			return units;

			return value;

		case 2:

			return unitSymbol;

			return units;

		case 3:

			return unitSymbol;

		case 4:

			return defaultValue;

		default:

			throw new org.apache.avro.AvroRuntimeException("Bad index");
@@ -160,12 +179,15 @@ public class DimensionDTO extends org.apache.avro.specific.SpecificRecordBase 
			name = value$.toString();

			break;

		case 1:

			units = value$.toString();

			value = value$.toString();

			break;

		case 2:

			unitSymbol = value$ != null ? value$.toString() : null;

			units = value$.toString();

			break;

		case 3:

			unitSymbol = value$ != null ? value$.toString() : null;

			break;

		case 4:

			defaultValue = value$.toString();

			break;

		default:

atlas-lib/src/test/java/es/redmic/atlaslib/unit/utils/LayerDataUtil.java

+1 −0
Original line number Diff line number Diff line
@@ -622,6 +622,7 @@ public abstract class LayerDataUtil { 
		dimension.setName("time");

		dimension.setUnits("ISO8601");

		dimension.setDefaultValue("P30M/PRESENT");

		dimension.setValue("2021-01-01T00:00:00.000Z/2021-12-18T00:00:00.000Z/PT2H");



		return dimension;

	}