[WFCORE-7079] Remove ModuleIdentifier usage from Version module #6268
Conversation
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
|
Core -> WildFly Preview Integration Build 14162 outcome was UNKNOWN using a merge of 0a22c5e |
This comment was marked as outdated.
This comment was marked as outdated.
|
|
||
| private ProductConfProps(String slot) { | ||
| this.productModuleId = slot == null ? null : ModuleIdentifier.create("org.jboss.as.product", slot); | ||
| this.productModuleId = slot == null ? null : "org.jboss.as.product:" + slot; |
There was a problem hiding this comment.
@yersan This needs to be:
this.productModuleId = slot == null ? null : ("main".equals(slot) ? "org.jboss.as.product" : "org.jboss.as.product:" + slot);
or something equivalent.
This constructor is called with slot == "main", and the canonical string representation of a module with slot 'main' is to NOT include ":main". The ModuleIdentifier class implements that logic. Where we discard its use we need to implement it ourselves.
I want to add utility methods that we can call throughout WF to handle this kind of thing, somewhere in the 'controller' or 'server' modules, but for the 'version' module I think I just needs to be manually coded.
There was a problem hiding this comment.
#6270is the proposed utility. But, not usable here. Not really needed either, as the use case here is simple. That PR has a lot of code related to escaping arbitrary inputs but I think this code can assume that any slot value is simple text that doesn't need escaping.
|
Thanks @yersan |
Jira issue: https://issues.redhat.com/browse/WFCORE-7079