Skip to content

feat: add and complete Identifiers.java for HasIdentifier contract with dave #432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hpehl merged 3 commits into from
Oct 21, 2026
Merged

feat: add and complete Identifiers.java for HasIdentifier contract with dave #432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6af9eb1
feat: add Identifiers.java for HasIdentifier contract with dave
hpehl Oct 20, 2026
c94415d
refactor: delegate AddressTemplate.identifier() to Identifiers.fromTe…
hpehl Oct 20, 2026
0bbee72
feat: complete Identifiers.java with all static HasIdentifier constan…
hpehl Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions meta/src/main/java/org/jboss/hal/meta/AddressTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
import java.util.Optional;
import java.util.function.Predicate;

import org.jboss.elemento.Id;
import org.jboss.hal.dmr.ModelNode;
import org.jboss.hal.dmr.ResourceAddress;
import org.jboss.hal.meta.WildcardResolver.Direction;
import org.jboss.hal.resources.Identifiers;

import static java.util.Collections.emptyList;
import static java.util.Collections.singletonList;
Expand Down Expand Up @@ -448,16 +448,7 @@ public Iterator<Segment> iterator() {

/** @return a sanitized, DOM-safe identifier derived from this template, suitable for use as an HTML element ID */
public String identifier() {
if (isEmpty()) {
return "root";
} else {
String safeTemplate = template
.replace("/", "-s-")
.replace("=", "-e-")
.replace(":", "-c-")
.replace("*", "-w-");
return Id.build(safeTemplate);
}
return Identifiers.fromTemplate(template);
}

// ------------------------------------------------------ resolve
Expand Down
15 changes: 8 additions & 7 deletions op/console/src/main/java/org/jboss/hal/op/configuration/ConfigurationColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import jakarta.inject.Inject;

import org.jboss.hal.op.configuration.socket.SocketBindingGroupColumn;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.jboss.hal.ui.finder.ColumnRegistry;
import org.patternfly.extension.finder.FinderColumn;
Expand All @@ -43,8 +44,8 @@
@Dependent
public class ConfigurationColumn implements ColumnProvider {

/** Column identifier used for registration and OUIA test IDs. */
public static final String ID = "configuration-column";
/** Column identifier used for registration and test IDs. */
public static final String ID = Identifiers.CONFIGURATION_COLUMN;

private final Instance<ColumnRegistry> registry;

Expand All @@ -62,31 +63,31 @@ public String identifier() {
public FinderColumn get() {
return finderColumn(ID)
.addHeader(finderColumnHeader("Configuration"))
.addItem(finderItem("subsystems-item", "Subsystems")
.addItem(finderItem(Identifiers.SUBSYSTEMS_ITEM, "Subsystems")
.nextColumn(registry.get().column(SubsystemColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Subsystems", stack -> stack
.addItem(stackItem().add(content(p).editorial().html(SUBSYSTEM_DESCRIPTION))))))
.addItem(finderItem("interfaces-item", "Interfaces")
.addItem(finderItem(Identifiers.INTERFACES_ITEM, "Interfaces")
.nextColumn(registry.get().column(InterfaceColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Interfaces", stack -> stack
.addItem(stackItem()
.add(content(p).editorial().html(INTERFACE_DESCRIPTION_1))
.add(content(p).editorial().html(INTERFACE_DESCRIPTION_2))))))
.addItem(finderItem("socket-bindings-item", "Socket Bindings")
.addItem(finderItem(Identifiers.SOCKET_BINDINGS_ITEM, "Socket Bindings")
.nextColumn(registry.get().column(SocketBindingGroupColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Socket Bindings", stack -> stack
.addItem(stackItem().add(content(p).editorial().html(SOCKET_BINDING_DESCRIPTION))))))
.addItem(finderItem("paths-item", "Paths")
.addItem(finderItem(Identifiers.PATHS_ITEM, "Paths")
.nextColumn(registry.get().column(PathColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "Paths", stack -> stack
.addItem(stackItem()
.add(content(p).editorial().html(PATH_DESCRIPTION_1))
.add(content(p).editorial().html(PATH_DESCRIPTION_2))))))
.addItem(finderItem("system-properties-item", "System Properties")
.addItem(finderItem(Identifiers.SYSTEM_PROPERTIES_ITEM, "System Properties")
.nextColumn(registry.get().column(SystemPropertyColumn.ID))
.onPreview((item, preview) ->
stackPreview(preview, "System Properties", stack -> stack
Expand Down
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/configuration/InterfaceColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.jboss.hal.dmr.dispatch.Dispatcher;
import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.meta.StatementContext;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;
import org.patternfly.extension.finder.FinderItem;
Expand Down Expand Up @@ -59,7 +60,7 @@
@Dependent
public class InterfaceColumn implements ColumnProvider {

public static final String ID = "interface-column";
public static final String ID = Identifiers.INTERFACE_COLUMN;
private static final AddressTemplate TEMPLATE = AddressTemplate.ofTrusted("interface=*");

private final Dispatcher dispatcher;
Expand Down
5 changes: 3 additions & 2 deletions op/console/src/main/java/org/jboss/hal/op/configuration/PathColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import jakarta.enterprise.context.Dependent;

import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;

Expand All @@ -28,8 +29,8 @@
@Dependent
public class PathColumn implements ColumnProvider {

/** Column identifier used for registration and OUIA test IDs. */
public static final String ID = "path-column";
/** Column identifier used for registration and test IDs. */
public static final String ID = Identifiers.PATH_COLUMN;
private static final AddressTemplate TEMPLATE = AddressTemplate.ofTrusted("path=*");

@Override
Expand Down
5 changes: 3 additions & 2 deletions op/console/src/main/java/org/jboss/hal/op/configuration/SubsystemColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import org.jboss.elemento.Id;
import org.jboss.elemento.router.PlaceManager;
import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;

Expand All @@ -45,8 +46,8 @@
@Dependent
public class SubsystemColumn implements ColumnProvider {

/** Column identifier used for registration and OUIA test IDs. */
public static final String ID = "subsystem-column";
/** Column identifier used for registration and test IDs. */
public static final String ID = Identifiers.SUBSYSTEM_COLUMN;
private static final AddressTemplate TEMPLATE = AddressTemplate.ofTrusted("subsystem=*");
private final PlaceManager placeManager;

Expand Down
5 changes: 3 additions & 2 deletions op/console/src/main/java/org/jboss/hal/op/configuration/SystemPropertyColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import jakarta.enterprise.context.Dependent;

import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;

Expand All @@ -28,8 +29,8 @@
@Dependent
public class SystemPropertyColumn implements ColumnProvider {

/** Column identifier used for registration and OUIA test IDs. */
public static final String ID = "system-property-column";
/** Column identifier used for registration and test IDs. */
public static final String ID = Identifiers.SYSTEM_PROPERTY_COLUMN;
private static final AddressTemplate TEMPLATE = AddressTemplate.ofTrusted("system-property=*");

@Override
Expand Down
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/configuration/security/CredentialStoreTabs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import org.jboss.hal.dmr.dispatch.Dispatcher;
import org.jboss.hal.env.Environment;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.meta.Metadata;
import org.jboss.hal.ui.resource.shell.ResourceTabs;
Expand Down Expand Up @@ -57,7 +58,7 @@ public boolean appliesTo(Environment environment, AddressTemplate template) {

@Override
public Promise<ResourceTabs> customizeTabs(AddressTemplate template, Metadata metadata, ResourceTabs defaultTabs) {
return Promise.resolve(defaultTabs.addTab(1, "credential-store-aliases", "Aliases",
return Promise.resolve(defaultTabs.addTab(1, Identifiers.CREDENTIAL_STORE_ALIASES_TAB, "Aliases",
aliasManager(dispatcher, template, metadata).element()));
}
}
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/configuration/socket/InboundColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import jakarta.enterprise.context.Dependent;

import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;

Expand All @@ -26,7 +27,7 @@
@Dependent
public class InboundColumn implements ColumnProvider {

public static final String ID = "socket-binding-inbound";
public static final String ID = Identifiers.SOCKET_BINDING_INBOUND;

@Override
public String identifier() {
Expand Down
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/configuration/socket/OutboundLocalColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import jakarta.enterprise.context.Dependent;

import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;

Expand All @@ -26,7 +27,7 @@
@Dependent
public class OutboundLocalColumn implements ColumnProvider {

public static final String ID = "socket-binding-outbound-local";
public static final String ID = Identifiers.SOCKET_BINDING_OUTBOUND_LOCAL;

@Override
public String identifier() {
Expand Down
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/configuration/socket/OutboundRemoteColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import jakarta.enterprise.context.Dependent;

import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.patternfly.extension.finder.FinderColumn;

Expand All @@ -26,7 +27,7 @@
@Dependent
public class OutboundRemoteColumn implements ColumnProvider {

public static final String ID = "socket-binding-outbound-remote";
public static final String ID = Identifiers.SOCKET_BINDING_OUTBOUND_REMOTE;

@Override
public String identifier() {
Expand Down
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/configuration/socket/SocketBindingGroupColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import jakarta.inject.Inject;

import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.jboss.hal.ui.finder.ColumnRegistry;
import org.patternfly.extension.finder.FinderColumn;
Expand All @@ -31,7 +32,7 @@
@Dependent
public class SocketBindingGroupColumn implements ColumnProvider {

public static final String ID = "socket-binding-group-column";
public static final String ID = Identifiers.SOCKET_BINDING_GROUP_COLUMN;
private static final AddressTemplate TEMPLATE = AddressTemplate.ofTrusted("socket-binding-group=*");

private final Instance<ColumnRegistry> registry;
Expand Down
9 changes: 5 additions & 4 deletions op/console/src/main/java/org/jboss/hal/op/configuration/socket/SocketBindingTypeColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import jakarta.enterprise.inject.Instance;
import jakarta.inject.Inject;

import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.ui.finder.ColumnProvider;
import org.jboss.hal.ui.finder.ColumnRegistry;
import org.patternfly.extension.finder.FinderColumn;
Expand All @@ -40,7 +41,7 @@
@Dependent
public class SocketBindingTypeColumn implements ColumnProvider {

public static final String ID = "socket-binding-type";
public static final String ID = Identifiers.SOCKET_BINDING_TYPE;
private final Instance<ColumnRegistry> registry;

@Inject
Expand All @@ -57,15 +58,15 @@ public String identifier() {
public FinderColumn get() {
return finderColumn(ID)
.addHeader(finderColumnHeader("Type"))
.addItem(finderItem("inbound", "Inbound")
.addItem(finderItem(Identifiers.INBOUND_ITEM, "Inbound")
.icon(far.circleLeft())
.store(RESOURCE_NAME, SOCKET_BINDING)
.nextColumn(registry.get().column(InboundColumn.ID)))
.addItem(finderItem("outbound-local", "Outbound Local")
.addItem(finderItem(Identifiers.OUTBOUND_LOCAL_ITEM, "Outbound Local")
.store(RESOURCE_NAME, LOCAL_DESTINATION_OUTBOUND_SOCKET_BINDING)
.icon(far.circleRight())
.nextColumn(registry.get().column(OutboundLocalColumn.ID)))
.addItem(finderItem("outbound-remote", "Outbound Remote")
.addItem(finderItem(Identifiers.OUTBOUND_REMOTE_ITEM, "Outbound Remote")
.store(RESOURCE_NAME, REMOTE_DESTINATION_OUTBOUND_SOCKET_BINDING)
.icon(fas.circleArrowRight())
.nextColumn(registry.get().column(OutboundRemoteColumn.ID)));
Expand Down
7 changes: 4 additions & 3 deletions op/console/src/main/java/org/jboss/hal/op/dashboard/OverviewCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.jboss.hal.dmr.dispatch.Dispatcher;
import org.jboss.hal.env.Environment;
import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.meta.Metadata;
import org.jboss.hal.meta.MetadataRepository;
import org.jboss.hal.meta.StatementContext;
Expand Down Expand Up @@ -176,7 +177,7 @@ public void refresh() {
// Test of the native popover
var consoleTerm = descriptionListTerm(sentenceCase("console-version"));
var consoleText = (HTMLElement) consoleTerm.textDelegate();
var consoleGroup = descriptionListGroup("console-version")
var consoleGroup = descriptionListGroup(Identifiers.CONSOLE_VERSION)
.addTerm(consoleTerm)
.addDescription(descriptionListDescription(environment.applicationVersion().toString()));
consoleText.classList.add(modifier(helpText));
Expand All @@ -195,7 +196,7 @@ public void refresh() {
.addItem(consoleGroup)
.addItem(dlg(envAttributes, "stability", dld ->
dld.add(stabilityLabel(environment.serverStability()))))
.addItem(descriptionListGroup("operation-mode")
.addItem(descriptionListGroup(Identifiers.OPERATION_MODE)
.addTerm(descriptionListTerm(sentenceCase("operation-mode")))
.addDescription(descriptionListDescription(environment.operationMode().name())))
.addItem(configFileDlg(envAttributes, envNode))
Expand Down Expand Up @@ -252,7 +253,7 @@ private DescriptionListGroup configFileDlg(AttributeDescriptions envAttributes,
String domainConfig = filename(envNode.get("domain-config-file").asString());
String hostConfig = filename(envNode.get("host-config-file").asString());
String label = sentenceCase("config-file");
return descriptionListGroup("config-file")
return descriptionListGroup(Identifiers.CONFIG_FILE)
.addTerm(descriptionListTerm(label).icon(gear())
.help(attributeDescriptionPopover(label, envAttributes.get("domain-config-file"), descriptionOnly)))
.addDescription(descriptionListDescription()
Expand Down
13 changes: 7 additions & 6 deletions op/console/src/main/java/org/jboss/hal/op/dashboard/RuntimeCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.jboss.hal.dmr.Operation;
import org.jboss.hal.dmr.dispatch.Dispatcher;
import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.meta.Metadata;
import org.jboss.hal.meta.MetadataRepository;
import org.jboss.hal.meta.StatementContext;
Expand Down Expand Up @@ -209,18 +210,18 @@ private Card hostInfoCard(ModelNode modelNode, AttributeDescriptions ad) {
.addTitle(cardTitle()
.run(ct -> ct.textDelegate().appendChild(title(2, xl, "Host").element())))
.addBody(cardBody().add(descriptionList()
.addItem(descriptionListGroup("host-name")
.addItem(descriptionListGroup(Identifiers.HOST_NAME)
.addTerm(descriptionListTerm("Name")
.help(attributeDescriptionPopover("Name", ad.get("host-operating-system"),
descriptionOnly)))
.addDescription(descriptionListDescription(modelNode.get("host-operating-system").asString())))
.addItem(descriptionListGroup("host-arch")
.addItem(descriptionListGroup(Identifiers.HOST_ARCH)
.addTerm(descriptionListTerm("Architecture")
.help(attributeDescriptionPopover("Architecture", cpuAd.get("host-cpu-arch"),
descriptionOnly)))
.addDescription(descriptionListDescription(
ModelNodeHelper.nested(modelNode, "host-cpu.host-cpu-arch").asString())))
.addItem(descriptionListGroup("host-cores")
.addItem(descriptionListGroup(Identifiers.HOST_CORES)
.addTerm(descriptionListTerm("Cores")
.help(attributeDescriptionPopover("Cores", cpuAd.get("host-core-count"),
descriptionOnly)))
Expand All @@ -234,17 +235,17 @@ private Card jvmInfoCard(ModelNode modelNode, AttributeDescriptions ad) {
.addTitle(cardTitle()
.run(ct -> ct.textDelegate().appendChild(title(2, xl, "JVM").element())))
.addBody(cardBody().add(descriptionList()
.addItem(descriptionListGroup("jvm-name")
.addItem(descriptionListGroup(Identifiers.JVM_NAME)
.addTerm(descriptionListTerm("Name"))
.addDescription(descriptionListDescription(
ModelNodeHelper.nested(modelNode, "jvm.name").asString())))
.addItem(descriptionListGroup("jvm-version")
.addItem(descriptionListGroup(Identifiers.JVM_VERSION)
.addTerm(descriptionListTerm("Version")
.help(attributeDescriptionPopover("Version", jvmAd.get("jvm-version"),
descriptionOnly)))
.addDescription(descriptionListDescription(
ModelNodeHelper.nested(modelNode, "jvm.jvm-version").asString())))
.addItem(descriptionListGroup("jvm-vendor")
.addItem(descriptionListGroup(Identifiers.JVM_VENDOR)
.addTerm(descriptionListTerm("Vendor")
.help(attributeDescriptionPopover("Vendor", jvmAd.get("jvm-vendor"),
descriptionOnly)))
Expand Down
3 changes: 2 additions & 1 deletion op/console/src/main/java/org/jboss/hal/op/dashboard/StatusCard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.jboss.hal.dmr.dispatch.Dispatcher;
import org.jboss.hal.env.Environment;
import org.jboss.hal.meta.AddressTemplate;
import org.jboss.hal.resources.Identifiers;
import org.jboss.hal.meta.Metadata;
import org.jboss.hal.meta.MetadataRepository;
import org.jboss.hal.meta.StatementContext;
Expand Down Expand Up @@ -153,7 +154,7 @@ public void refresh() {
}
cardBody.add(descriptionList()
.autoFit()
.addItem(descriptionListGroup("runtime-configuration-state")
.addItem(descriptionListGroup(Identifiers.RUNTIME_CONFIGURATION_STATE)
.addTerm(descriptionListTerm("Configuration state")
.help(attributeDescriptionPopover("Configuration state",
rootAttributes.get("runtime-configuration-state"), descriptionOnly)))
Expand Down
Loading
Loading