LPD-37194 buildRest

liferay · Sep 24, 2024 · e7c4a33 · e7c4a33
1 parent b397dc9
commit e7c4a33
Show file tree

Hide file tree

Showing 3 changed files with 214 additions and 2 deletions.
diff --git a/...est-api/src/main/java/com/liferay/analytics/reports/rest/dto/v1_0/AppearsOnHistogram.java b/...est-api/src/main/java/com/liferay/analytics/reports/rest/dto/v1_0/AppearsOnHistogram.java
@@ -50,6 +50,47 @@ public static AppearsOnHistogram unsafeToDTO(String json) {
 		return ObjectMapperUtil.unsafeReadValue(AppearsOnHistogram.class, json);
 	}
 
+	@Schema
+	public String getCanonicalUrl() {
+		if (_canonicalUrlSupplier != null) {
+			canonicalUrl = _canonicalUrlSupplier.get();
+
+			_canonicalUrlSupplier = null;
+		}
+
+		return canonicalUrl;
+	}
+
+	public void setCanonicalUrl(String canonicalUrl) {
+		this.canonicalUrl = canonicalUrl;
+
+		_canonicalUrlSupplier = null;
+	}
+
+	@JsonIgnore
+	public void setCanonicalUrl(
+		UnsafeSupplier<String, Exception> canonicalUrlUnsafeSupplier) {
+
+		_canonicalUrlSupplier = () -> {
+			try {
+				return canonicalUrlUnsafeSupplier.get();
+			}
+			catch (RuntimeException runtimeException) {
+				throw runtimeException;
+			}
+			catch (Exception exception) {
+				throw new RuntimeException(exception);
+			}
+		};
+	}
+
+	@GraphQLField
+	@JsonProperty(access = JsonProperty.Access.READ_WRITE)
+	protected String canonicalUrl;
+
+	@JsonIgnore
+	private Supplier<String> _canonicalUrlSupplier;
+
 	@Schema
 	@Valid
 	public Metric[] getMetrics() {
@@ -174,6 +215,47 @@ public void setTotal(
 	@JsonIgnore
 	private Supplier<Double> _totalSupplier;
 
+	@Schema
+	public Double getTotalValue() {
+		if (_totalValueSupplier != null) {
+			totalValue = _totalValueSupplier.get();
+
+			_totalValueSupplier = null;
+		}
+
+		return totalValue;
+	}
+
+	public void setTotalValue(Double totalValue) {
+		this.totalValue = totalValue;
+
+		_totalValueSupplier = null;
+	}
+
+	@JsonIgnore
+	public void setTotalValue(
+		UnsafeSupplier<Double, Exception> totalValueUnsafeSupplier) {
+
+		_totalValueSupplier = () -> {
+			try {
+				return totalValueUnsafeSupplier.get();
+			}
+			catch (RuntimeException runtimeException) {
+				throw runtimeException;
+			}
+			catch (Exception exception) {
+				throw new RuntimeException(exception);
+			}
+		};
+	}
+
+	@GraphQLField
+	@JsonProperty(access = JsonProperty.Access.READ_WRITE)
+	protected Double totalValue;
+
+	@JsonIgnore
+	private Supplier<Double> _totalValueSupplier;
+
 	@Override
 	public boolean equals(Object object) {
 		if (this == object) {
@@ -201,6 +283,22 @@ public String toString() {
 
 		sb.append("{");
 
+		String canonicalUrl = getCanonicalUrl();
+
+		if (canonicalUrl != null) {
+			if (sb.length() > 1) {
+				sb.append(", ");
+			}
+
+			sb.append("\"canonicalUrl\": ");
+
+			sb.append("\"");
+
+			sb.append(_escape(canonicalUrl));
+
+			sb.append("\"");
+		}
+
 		Metric[] metrics = getMetrics();
 
 		if (metrics != null) {
@@ -251,6 +349,18 @@ public String toString() {
 			sb.append(total);
 		}
 
+		Double totalValue = getTotalValue();
+
+		if (totalValue != null) {
+			if (sb.length() > 1) {
+				sb.append(", ");
+			}
+
+			sb.append("\"totalValue\": ");
+
+			sb.append(totalValue);
+		}
+
 		sb.append("}");
 
 		return sb.toString();

diff --git a/.../src/main/java/com/liferay/analytics/reports/rest/client/dto/v1_0/AppearsOnHistogram.java b/.../src/main/java/com/liferay/analytics/reports/rest/client/dto/v1_0/AppearsOnHistogram.java
@@ -25,6 +25,27 @@ public static AppearsOnHistogram toDTO(String json) {
 		return AppearsOnHistogramSerDes.toDTO(json);
 	}
 
+	public String getCanonicalUrl() {
+		return canonicalUrl;
+	}
+
+	public void setCanonicalUrl(String canonicalUrl) {
+		this.canonicalUrl = canonicalUrl;
+	}
+
+	public void setCanonicalUrl(
+		UnsafeSupplier<String, Exception> canonicalUrlUnsafeSupplier) {
+
+		try {
+			canonicalUrl = canonicalUrlUnsafeSupplier.get();
+		}
+		catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	protected String canonicalUrl;
+
 	public Metric[] getMetrics() {
 		return metrics;
 	}
@@ -88,6 +109,27 @@ public void setTotal(
 
 	protected Double total;
 
+	public Double getTotalValue() {
+		return totalValue;
+	}
+
+	public void setTotalValue(Double totalValue) {
+		this.totalValue = totalValue;
+	}
+
+	public void setTotalValue(
+		UnsafeSupplier<Double, Exception> totalValueUnsafeSupplier) {
+
+		try {
+			totalValue = totalValueUnsafeSupplier.get();
+		}
+		catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+	}
+
+	protected Double totalValue;
+
 	@Override
 	public AppearsOnHistogram clone() throws CloneNotSupportedException {
 		return (AppearsOnHistogram)super.clone();

diff --git a/.../java/com/liferay/analytics/reports/rest/client/serdes/v1_0/AppearsOnHistogramSerDes.java b/.../java/com/liferay/analytics/reports/rest/client/serdes/v1_0/AppearsOnHistogramSerDes.java
@@ -47,6 +47,20 @@ public static String toJSON(AppearsOnHistogram appearsOnHistogram) {
 
 		sb.append("{");
 
+		if (appearsOnHistogram.getCanonicalUrl() != null) {
+			if (sb.length() > 1) {
+				sb.append(", ");
+			}
+
+			sb.append("\"canonicalUrl\": ");
+
+			sb.append("\"");
+
+			sb.append(_escape(appearsOnHistogram.getCanonicalUrl()));
+
+			sb.append("\"");
+		}
+
 		if (appearsOnHistogram.getMetrics() != null) {
 			if (sb.length() > 1) {
 				sb.append(", ");
@@ -91,6 +105,16 @@ public static String toJSON(AppearsOnHistogram appearsOnHistogram) {
 			sb.append(appearsOnHistogram.getTotal());
 		}
 
+		if (appearsOnHistogram.getTotalValue() != null) {
+			if (sb.length() > 1) {
+				sb.append(", ");
+			}
+
+			sb.append("\"totalValue\": ");
+
+			sb.append(appearsOnHistogram.getTotalValue());
+		}
+
 		sb.append("}");
 
 		return sb.toString();
@@ -112,6 +136,15 @@ public static Map<String, String> toMap(
 
 		Map<String, String> map = new TreeMap<>();
 
+		if (appearsOnHistogram.getCanonicalUrl() == null) {
+			map.put("canonicalUrl", null);
+		}
+		else {
+			map.put(
+				"canonicalUrl",
+				String.valueOf(appearsOnHistogram.getCanonicalUrl()));
+		}
+
 		if (appearsOnHistogram.getMetrics() == null) {
 			map.put("metrics", null);
 		}
@@ -134,6 +167,15 @@ public static Map<String, String> toMap(
 			map.put("total", String.valueOf(appearsOnHistogram.getTotal()));
 		}
 
+		if (appearsOnHistogram.getTotalValue() == null) {
+			map.put("totalValue", null);
+		}
+		else {
+			map.put(
+				"totalValue",
+				String.valueOf(appearsOnHistogram.getTotalValue()));
+		}
+
 		return map;
 	}
 
@@ -152,7 +194,10 @@ protected AppearsOnHistogram[] createDTOArray(int size) {
 
 		@Override
 		protected boolean parseMaps(String jsonParserFieldName) {
-			if (Objects.equals(jsonParserFieldName, "metrics")) {
+			if (Objects.equals(jsonParserFieldName, "canonicalUrl")) {
+				return false;
+			}
+			else if (Objects.equals(jsonParserFieldName, "metrics")) {
 				return false;
 			}
 			else if (Objects.equals(jsonParserFieldName, "pageTitle")) {
@@ -161,6 +206,9 @@ else if (Objects.equals(jsonParserFieldName, "pageTitle")) {
 			else if (Objects.equals(jsonParserFieldName, "total")) {
 				return false;
 			}
+			else if (Objects.equals(jsonParserFieldName, "totalValue")) {
+				return false;
+			}
 
 			return false;
 		}
@@ -170,7 +218,13 @@ protected void setField(
 			AppearsOnHistogram appearsOnHistogram, String jsonParserFieldName,
 			Object jsonParserFieldValue) {
 
-			if (Objects.equals(jsonParserFieldName, "metrics")) {
+			if (Objects.equals(jsonParserFieldName, "canonicalUrl")) {
+				if (jsonParserFieldValue != null) {
+					appearsOnHistogram.setCanonicalUrl(
+						(String)jsonParserFieldValue);
+				}
+			}
+			else if (Objects.equals(jsonParserFieldName, "metrics")) {
 				if (jsonParserFieldValue != null) {
 					Object[] jsonParserFieldValues =
 						(Object[])jsonParserFieldValue;
@@ -198,6 +252,12 @@ else if (Objects.equals(jsonParserFieldName, "total")) {
 						Double.valueOf((String)jsonParserFieldValue));
 				}
 			}
+			else if (Objects.equals(jsonParserFieldName, "totalValue")) {
+				if (jsonParserFieldValue != null) {
+					appearsOnHistogram.setTotalValue(
+						Double.valueOf((String)jsonParserFieldValue));
+				}
+			}
 		}
 
 	}