@@ -128,9 +128,19 @@ protected Module preloadModule(final String name) throws ModuleLoadException {
128128 }
129129 }
130130
131+ /**
132+ * @deprecated Will be made protected in line with this method in the parent class Use {@link ServiceModuleLoader#findModule(String)}
133+ */
134+ @ Deprecated (forRemoval = true , since = "27.0.0" )
131135 @ SuppressWarnings ("unchecked" )
132136 @ Override
133137 public ModuleSpec findModule (ModuleIdentifier identifier ) throws ModuleLoadException {
138+ return findModule (identifier .toString ());
139+ }
140+
141+ @ SuppressWarnings ("unchecked" )
142+ @ Override
143+ protected ModuleSpec findModule (String identifier ) throws ModuleLoadException {
134144 ServiceController <ModuleDefinition > controller = (ServiceController <ModuleDefinition >) serviceContainer .getService (moduleSpecServiceName (identifier ));
135145 if (controller == null ) {
136146 ServerLogger .MODULE_SERVICE_LOGGER .debugf ("Could not load module '%s' as corresponding module spec service '%s' was not found" , identifier , identifier );
@@ -193,18 +203,42 @@ public static void addService(final ServiceTarget serviceTarget, final Bootstrap
193203 *
194204 * @param identifier The module identifier
195205 * @return The service name of the ModuleSpec service
206+ * @deprecated Use {@link ServiceModuleLoader#moduleSpecServiceName(String)}
196207 */
208+ @ Deprecated (forRemoval = true , since = "27.0.0" )
197209 public static ServiceName moduleSpecServiceName (ModuleIdentifier identifier ) {
210+ return moduleSpecServiceName (identifier .toString ());
211+ }
212+
213+ /**
214+ * Returns the corresponding ModuleSpec service name for the given module.
215+ *
216+ * @param identifier The module identifier string, method does not support non-canonized identifiers
217+ * @return The service name of the ModuleSpec service
218+ */
219+ public static ServiceName moduleSpecServiceName (String identifier ) {
198220 if (!isDynamicModule (identifier )) {
199221 throw ServerLogger .ROOT_LOGGER .missingModulePrefix (identifier , MODULE_PREFIX );
200222 }
201- return MODULE_SPEC_SERVICE_PREFIX .append (identifier . getName ()). append ( identifier . getSlot () );
223+ return MODULE_SPEC_SERVICE_PREFIX .append (identifier );
202224 }
203225
226+ /**
227+ * @deprecated Use {@link ServiceModuleLoader#installModuleResolvedService(ServiceTarget, String)}
228+ */
229+ @ Deprecated (forRemoval = true , since = "27.0.0" )
204230 public static void installModuleResolvedService (ServiceTarget serviceTarget , ModuleIdentifier identifier ) {
231+ installModuleResolvedService (serviceTarget , identifier .toString ());
232+ }
233+
234+ /**
235+ * @param serviceTarget service target to use to install the service. Cannot be {@code null}.
236+ * @param identifier The module identifier string, method does not support non-canonized identifiers
237+ */
238+ public static void installModuleResolvedService (ServiceTarget serviceTarget , String identifier ) {
205239 final ServiceName sn = ServiceModuleLoader .moduleResolvedServiceName (identifier );
206240 final ServiceBuilder <?> sb = serviceTarget .addService (sn );
207- final Consumer <ModuleIdentifier > moduleIdConsumer = sb .provides (sn );
241+ final Consumer <String > moduleIdConsumer = sb .provides (sn );
208242 sb .requires (moduleSpecServiceName (identifier ));
209243 final org .jboss .msc .Service resolvedService = org .jboss .msc .Service .newInstance (moduleIdConsumer , identifier );
210244 sb .setInstance (resolvedService );
@@ -220,31 +254,72 @@ public static void installModuleResolvedService(ServiceTarget serviceTarget, Mod
220254 *
221255 * @param identifier The module identifier
222256 * @return The service name of the ModuleSpec service
257+ * @deprecated Use {@link ServiceModuleLoader#moduleResolvedServiceName(String)}
223258 */
259+ @ Deprecated (forRemoval = true , since = "27.0.0" )
224260 public static ServiceName moduleResolvedServiceName (ModuleIdentifier identifier ) {
261+ return moduleResolvedServiceName (identifier .toString ());
262+ }
263+
264+ /**
265+ * Returns the corresponding module resolved service name for the given module.
266+ *
267+ * The module resolved service is basically a latch that prevents the module from being loaded
268+ * until all the transitive dependencies that it depends upon have have their module spec services
269+ * come up.
270+ *
271+ * @param identifier The module identifier string, method does not support non-canonized identifiers
272+ * @return The service name of the ModuleSpec service
273+ */
274+ public static ServiceName moduleResolvedServiceName (String identifier ) {
225275 if (!isDynamicModule (identifier )) {
226276 throw ServerLogger .ROOT_LOGGER .missingModulePrefix (identifier , MODULE_PREFIX );
227277 }
228- return MODULE_RESOLVED_SERVICE_PREFIX .append (identifier . getName ()). append ( identifier . getSlot () );
278+ return MODULE_RESOLVED_SERVICE_PREFIX .append (identifier );
229279 }
230280
231281 /**
232282 * Returns true if the module identifier is a dynamic module that will be loaded by this module loader
283+ *
284+ * @deprecated Use {@link ServiceModuleLoader#isDynamicModule(String)}
233285 */
286+ @ Deprecated (forRemoval = true , since = "27.0.0" )
234287 public static boolean isDynamicModule (ModuleIdentifier identifier ) {
235- return identifier .getName ().startsWith (MODULE_PREFIX );
288+ return isDynamicModule (identifier .toString ());
289+ }
290+
291+ /**
292+ * Returns true if the module identifier is a dynamic module that will be loaded by this module loader
293+ *
294+ * @param identifier The module identifier string, method does not support non-canonized identifiers
295+ * @return Whether the module identifier is a dynamic module
296+ */
297+ public static boolean isDynamicModule (String identifier ) {
298+ return identifier .startsWith (MODULE_PREFIX );
236299 }
237300
238301 /**
239302 * Returns the corresponding ModuleLoadService service name for the given module.
240303 *
241304 * @param identifier The module identifier
242305 * @return The service name of the ModuleLoadService service
306+ * @deprecated Use {@link ServiceModuleLoader#moduleServiceName(String)}
243307 */
308+ @ Deprecated (forRemoval = true , since = "27.0.0" )
244309 public static ServiceName moduleServiceName (ModuleIdentifier identifier ) {
245- if (!identifier .getName ().startsWith (MODULE_PREFIX )) {
310+ return moduleServiceName (identifier .toString ());
311+ }
312+
313+ /**
314+ * Returns the corresponding ModuleLoadService service name for the given module.
315+ *
316+ * @param identifier The module identifier string, method does not support non-canonized identifiers
317+ * @return The service name of the ModuleLoadService service
318+ */
319+ public static ServiceName moduleServiceName (String identifier ) {
320+ if (!identifier .startsWith (MODULE_PREFIX )) {
246321 throw ServerLogger .ROOT_LOGGER .missingModulePrefix (identifier , MODULE_PREFIX );
247322 }
248- return MODULE_SERVICE_PREFIX .append (identifier . getName ()). append ( identifier . getSlot () );
323+ return MODULE_SERVICE_PREFIX .append (identifier );
249324 }
250325}
0 commit comments