From fdf2b14c09076ef75dae101f1bb2d3519ab9e890 Mon Sep 17 00:00:00 2001 From: Michal Petrov Date: Fri, 20 Mar 2026 15:12:32 +0100 Subject: [PATCH] HAL-2055: fix metadata retrieval --- .../subsystem/undertow/ServletContainerView.java | 12 ++++++------ .../subsystem/webservice/ConfigElement.java | 3 ++- .../hal/meta/description/ResourceDescription.java | 5 ----- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java index c8ae2c6272..8fe8772d06 100644 --- a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java +++ b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/undertow/ServletContainerView.java @@ -92,21 +92,21 @@ public ServletContainerView(Dispatcher dispatcher, Metadata emptyMetadata = Metadata.empty(); - ModelNode mimeMappingDescription = failSafeGet(configurationMetadata.getDescription(), - "children/mime-mapping/description"); // NON-NLS + String mimeMappingDescription = metadataRegistry.lookup(SERVLET_CONTAINER_TEMPLATE.append(MIME_MAPPING + "=*")) + .getDescription().getDescription(); mimeMappingItem = new PropertiesItem(MIME_MAPPING, Names.MIME_MAPPING); mimeMappingForm = new ModelNodeForm.Builder<>(Ids.UNDERTOW_SERVLET_CONTAINER_MIME_MAPPING_FORM, emptyMetadata) - .unboundFormItem(mimeMappingItem, 0, SafeHtmlUtils.fromString(mimeMappingDescription.asString())) + .unboundFormItem(mimeMappingItem, 0, SafeHtmlUtils.fromString(mimeMappingDescription)) .exclude(VALUE) .onSave((form, changedValues) -> presenter.saveMimeMapping(mimeMappingItem.getValue())) .prepareReset(form -> presenter.resetMimeMapping(form)) .build(); - ModelNode welcomeFileDescription = failSafeGet(configurationMetadata.getDescription(), - "children/welcome-file/description"); // NON-NLS + String welcomeFileDescription = metadataRegistry.lookup(SERVLET_CONTAINER_TEMPLATE.append(WELCOME_FILE + "=*")) + .getDescription().getDescription(); welcomeFileItem = new ListItem(WELCOME_FILE, Names.WELCOME_FILE); welcomeFileForm = new ModelNodeForm.Builder<>(Ids.UNDERTOW_SERVLET_CONTAINER_WELCOME_FILE_FORM, emptyMetadata) - .unboundFormItem(welcomeFileItem, 0, SafeHtmlUtils.fromString(welcomeFileDescription.asString())) + .unboundFormItem(welcomeFileItem, 0, SafeHtmlUtils.fromString(welcomeFileDescription)) .onSave((form, changedValues) -> presenter.saveWelcomeFile(welcomeFileItem.getValue().stream() .collect(toMap(Function.identity(), value -> null)))) .prepareReset(form -> presenter.resetWelcomeFile(form)) diff --git a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/webservice/ConfigElement.java b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/webservice/ConfigElement.java index 039c7d405e..af34f963a6 100644 --- a/app/src/main/java/org/jboss/hal/client/configuration/subsystem/webservice/ConfigElement.java +++ b/app/src/main/java/org/jboss/hal/client/configuration/subsystem/webservice/ConfigElement.java @@ -80,7 +80,8 @@ class ConfigElement implements IsElement, Attachable, HasPresenter< .column(inlineActions) .build(); - String propertyDescription = metadata.getDescription().children().description(PROPERTY); + String propertyDescription = metadataRegistry.lookup(configType.template.append(PROPERTY + "=*")) + .getDescription().getDescription(); propertiesItem = new PropertiesItem(PROPERTY); form = new ModelNodeForm.Builder(Ids.build(configType.baseId, Ids.FORM), metadata) .unboundFormItem(propertiesItem, 0, SafeHtmlUtils.fromString(propertyDescription)) diff --git a/meta/src/main/java/org/jboss/hal/meta/description/ResourceDescription.java b/meta/src/main/java/org/jboss/hal/meta/description/ResourceDescription.java index 9b2af41c8f..3acde5a3b9 100644 --- a/meta/src/main/java/org/jboss/hal/meta/description/ResourceDescription.java +++ b/meta/src/main/java/org/jboss/hal/meta/description/ResourceDescription.java @@ -34,7 +34,6 @@ import static org.jboss.hal.dmr.ModelDescriptionConstants.ALTERNATIVES; import static org.jboss.hal.dmr.ModelDescriptionConstants.ATTRIBUTES; import static org.jboss.hal.dmr.ModelDescriptionConstants.ATTRIBUTE_GROUP; -import static org.jboss.hal.dmr.ModelDescriptionConstants.CHILDREN; import static org.jboss.hal.dmr.ModelDescriptionConstants.DEPRECATED; import static org.jboss.hal.dmr.ModelDescriptionConstants.DESCRIPTION; import static org.jboss.hal.dmr.ModelDescriptionConstants.NILLABLE; @@ -81,10 +80,6 @@ public AttributeCollection operations() { return getAttributes(OPERATIONS); } - public AttributeCollection children() { - return getAttributes(CHILDREN); - } - private AttributeCollection getAttributes(String path) { ModelNode attributes = ModelNodeHelper.failSafeGet(this, path); if (attributes.isDefined()) {