[ui] use isNumber() BasicType property in UiUtil

Author: mlaroche

vertigo-ui/src/main/java/io/vertigo/ui/impl/springmvc/util/UiUtil.java

@@ -41,7 +41,6 @@
 import io.vertigo.core.lang.WrappedException;
 import io.vertigo.core.locale.LocaleManager;
 import io.vertigo.core.node.Node;
-import io.vertigo.core.util.StringUtil;
 import io.vertigo.datamodel.data.definitions.DataDefinition;
 import io.vertigo.datamodel.data.definitions.DataField;
 import io.vertigo.datamodel.smarttype.SmartTypeManager;
@@ -95,7 +94,7 @@ public static String contextKey(final UiObject<?> uiObject) {
 	 * @return Name in context (use for input name)
 	 */
 	public static String generateComponentUID(final String component, final String object, final String field, final String row) {
-		final String prefix = component +
+		final var prefix = component +
 				Long.toHexString(UUID.randomUUID().getLeastSignificantBits()) +
 				"_";
 		return contextGet(prefix, object, field, row, true);
@@ -240,20 +239,7 @@ public static String smartTypeAlign(final String object, final String fieldName,
 			final var smartTypeDefinition = getDataField(object + '.' + fieldName).smartTypeDefinition();
 			if (smartTypeDefinition.getScope().isBasicType()) {
 				final var dataType = smartTypeDefinition.getBasicType();
-				switch (dataType) {
-					case Long:
-					case Integer:
-					case Double:
-					case BigDecimal:
-						return "right";
-					case Boolean:
-					case Instant:
-					case LocalDate:
-					case String:
-					case DataStream:
-					default:
-						return "left";
-				}
+				return dataType.isNumber() ? "right" : "left";
 			}
 		}
 		return "left";
@@ -391,9 +377,9 @@ public static String getCurrentLocaleForQuasar() {
 	public static String compileVueJsTemplate(final String template) {
 		final var requestParameter = new JsonObject();
 		requestParameter.add("template", new JsonPrimitive(template));
-		final JsonObject compiledTemplate = callRestWS("http://localhost:8083/", GSON.toJson(requestParameter), JsonObject.class);
+		final var compiledTemplate = (JsonObject) callRestWS("http://localhost:8083/", GSON.toJson(requestParameter), JsonObject.class);
 		final var render = compiledTemplate.get("render").getAsString();
-		final List<String> staticRenderFns = StreamSupport.stream(compiledTemplate.get("staticRenderFns").getAsJsonArray().spliterator(), false)
+		final var staticRenderFns = StreamSupport.stream(compiledTemplate.get("staticRenderFns").getAsJsonArray().spliterator(), false)
 				.map(JsonElement::getAsString)
 				.toList();
 
@@ -482,25 +468,18 @@ private static DataField getDataField(final String fieldPath) {
 	 * @return the resolved field name
 	 */
 	public static String resolveDisplayField(final String object, final String field) {
-		if (StringUtil.isBlank(object) || StringUtil.isBlank(field)) {
-			return null;
-		}
-
+		Assertion.check()
+				.isNotBlank(object)
+				.isNotBlank(field);
+		// ---
 		if (field.contains("_")) {
 			return field; // we don't modify the field if it already contains a modifier
 		}
-
 		final var dataField = getDataField(object + "." + field);
-		final var basicType = dataField.smartTypeDefinition().getBasicType();
-
-		switch (basicType) {
-			case BigDecimal:
-			case Double:
-			case Integer:
-			case Long:
-				return field + "_fmt";
-			default:
-				return field;
+		final var smartTypeDefinition = dataField.smartTypeDefinition();
+		if (smartTypeDefinition.getScope().isBasicType()) {
+			return smartTypeDefinition.getBasicType().isNumber() ? field + "_fmt" : field;
 		}
+		return field;
 	}
 }

vertigo-ui/src/main/resources/io/vertigo/ui/components/table/column.html

@@ -8,7 +8,7 @@
 	               columnClass=${model.util.smartTypeCss(list, field, class, 'col_'+name)},
 	               columnSortable=${sortable != null ? sortable : (field != null) },
 	               mySortField=${sortField?:field},
-	               myDisplayField=${model.util.resolveDisplayField(list, field)},
+	               myDisplayField=${field != null ? model.util.resolveDisplayField(list, field) : null},
 	               mySuffix=${model.util.smartTypeUnit(list, field, null)}">
 	<th:block th:with="objectKey=${model.vContext['componentStates']['__${componentId}__'].addObjectToList('columns', {'name': columnName, 'field': mySortField, 'label': columnLabel, 'align': columnAlign, 'sortable': (modifiableTable!=null?false:columnSortable), 'classes':(class?:columnClass), 'headerClasses':(class?:columnClass) })},
 				myDatetimeFormat=${datetimeFormat?:(field !=null ? model.util.getUiDatetimeFormat(list + '.' + field) : null)}">