[WFCORE-7091] Create the ModelTestModelControllerService variants for the WF 31 controllers #6280
+348
−79
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,58 +14,89 @@ | |
| import org.jboss.as.core.model.bridge.impl.LegacyControllerKernelServicesProxy; | ||
| import org.jboss.as.core.model.test.LegacyModelInitializerEntry; | ||
| import org.jboss.as.model.test.ModelTestOperationValidatorFilter; | ||
| import org.jboss.as.version.Stability; | ||
| import org.jboss.dmr.ModelNode; | ||
|
|
||
| /** | ||
| * @author <a href="[email protected]">Kabir Khan</a> | ||
| */ | ||
| public class ScopedKernelServicesBootstrap { | ||
| Stability stability; | ||
| ClassLoader legacyChildFirstClassLoader; | ||
| ClassLoaderObjectConverter objectConverter; | ||
|
|
||
| public ScopedKernelServicesBootstrap(ClassLoader legacyChildFirstClassLoader, Stability stability) { | ||
| this.legacyChildFirstClassLoader = legacyChildFirstClassLoader; | ||
| this.objectConverter = new ClassLoaderObjectConverterImpl(this.getClass().getClassLoader(), legacyChildFirstClassLoader); | ||
| this.stability = stability; | ||
| } | ||
|
|
||
| public LegacyControllerKernelServicesProxy createKernelServices(List<ModelNode> bootOperations, ModelTestOperationValidatorFilter validateOpsFilter, ModelVersion legacyModelVersion, List<LegacyModelInitializerEntry> modelInitializerEntries) throws Exception { | ||
|
|
||
| Object childClassLoaderKernelServices = createChildClassLoaderKernelServices(bootOperations, validateOpsFilter, legacyModelVersion, modelInitializerEntries); | ||
| return new LegacyControllerKernelServicesProxy(legacyChildFirstClassLoader, childClassLoaderKernelServices, objectConverter); | ||
| } | ||
|
|
||
| private Object createChildClassLoaderKernelServices(List<ModelNode> bootOperations, ModelTestOperationValidatorFilter validateOpsFilter, ModelVersion legacyModelVersion, List<LegacyModelInitializerEntry> modelInitializerEntries) { | ||
| try { | ||
| Class<?> clazz = legacyChildFirstClassLoader.loadClass(ChildFirstClassLoaderKernelServicesFactory.class.getName()); | ||
| List<Object> convertedBootOps = getConvertedBootOps(bootOperations); | ||
| List<Object> convertedModelInitializerEntries = convertModelInitializer(modelInitializerEntries); | ||
|
|
||
| Object convertedValidationFilter = objectConverter.convertValidateOperationsFilterToChildCl(validateOpsFilter); | ||
| Object convertedLegacyModelVersion = objectConverter.convertModelVersionToChildCl(legacyModelVersion); | ||
|
|
||
| if (!Stability.DEFAULT.equals(stability)) { | ||
| Method m = clazz.getMethod("create", | ||
| List.class, | ||
| legacyChildFirstClassLoader.loadClass(ModelTestOperationValidatorFilter.class.getName()), | ||
| legacyChildFirstClassLoader.loadClass(ModelVersion.class.getName()), | ||
| List.class, | ||
| String.class); | ||
|
|
||
| return m.invoke(null, | ||
| convertedBootOps, | ||
| convertedValidationFilter, | ||
| convertedLegacyModelVersion, | ||
| convertedModelInitializerEntries, | ||
| stability.toString()); | ||
| } else { | ||
| Method m = clazz.getMethod("create", | ||
| List.class, | ||
| legacyChildFirstClassLoader.loadClass(ModelTestOperationValidatorFilter.class.getName()), | ||
| legacyChildFirstClassLoader.loadClass(ModelVersion.class.getName()), | ||
| List.class); | ||
|
|
||
| return m.invoke(null, | ||
| convertedBootOps, | ||
| convertedValidationFilter, | ||
| convertedLegacyModelVersion, | ||
| convertedModelInitializerEntries); | ||
|
There was a problem hiding this comment. Can this be unified, e.g. so we just pass in null for the stabilty? If so you can get rid of this whole if/else block |
||
| } | ||
| } catch (Exception e) { | ||
| throw new RuntimeException(e); | ||
| } | ||
| } | ||
|
|
||
| private List<Object> convertModelInitializer(List<LegacyModelInitializerEntry> modelInitializerEntries) { | ||
| List<Object> converted = null; | ||
| if (modelInitializerEntries != null) { | ||
| converted = new ArrayList<>(); | ||
| for (LegacyModelInitializerEntry entry : modelInitializerEntries) { | ||
| converted.add(objectConverter.convertLegacyModelInitializerEntryToChildCl(entry)); | ||
| } | ||
| } | ||
| return converted; | ||
| } | ||
|
|
||
| private List<Object> getConvertedBootOps(List<ModelNode> bootOperations) { | ||
| List<Object> converted = new ArrayList<>(); | ||
| for (ModelNode node : bootOperations) { | ||
| if (node != null) { | ||
| converted.add(objectConverter.convertModelNodeToChildCl(node)); | ||
| } | ||
| } | ||
| return converted; | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This code seems to duplicate a lot of the code from the previous method. Can they be unified more?