Adding missing descriptions in top elements.

Signed-off-by: Emmanuel Hugonnet <ehugonne@redhat.com>

Author: ehsavoie

feature-spec-gen/src/main/java/org/wildfly/galleon/plugin/featurespec/generator/FeatureSpecGenerator.java

@@ -74,6 +74,7 @@ public class FeatureSpecGenerator implements ForkCallback {
     private Path standaloneSpecsFile;
     private Path domainSpecsFile;
     private String mimimumStability;
+    private String description;
 
     String getBranchId(String spec, int dots) {
         int i = 0;
@@ -141,13 +142,14 @@ public FeatureSpecGenerator() {
     }
 
     public FeatureSpecGenerator(String installation, Path outputDir, Map<String, Path> inheritedSpecs,
-            String mimimumStability, boolean fork, boolean debug) {
+            String mimimumStability, String description, boolean fork, boolean debug) {
         this.installation = installation;
         this.outputDir = outputDir;
         this.fork = fork;
         this.debug = debug;
         this.inheritedSpecs = inheritedSpecs;
         this.mimimumStability = mimimumStability;
+        this.description = description == null ? "" : description;
     }
 
     public int generateSpecs() throws ProvisioningException {
@@ -185,7 +187,7 @@ private void doGenerate() throws ProvisioningException {
         ModelNode domainRoots = null;
         if (fork) {
             String minStab = mimimumStability == null ? "" : mimimumStability;
-            ForkedEmbeddedUtil.fork(this, getStoredSystemProps(), installation, getStandaloneSpecsFile().toString(), getDomainSpecsFile().toString(), minStab);
+            ForkedEmbeddedUtil.fork(this, getStoredSystemProps(), installation, getStandaloneSpecsFile().toString(), getDomainSpecsFile().toString(), description , minStab);
             standaloneFeatures = readSpecsFile(getStandaloneSpecsFile());
             Path model = getStandaloneSpecsFile().getParent().resolve("model.json");
             try {
@@ -202,7 +204,7 @@ private void doGenerate() throws ProvisioningException {
             if (Files.exists(home.resolve(WfConstants.STANDALONE).resolve(WfConstants.CONFIGURATION))) {
                 standaloneFeatures = readFeatureSpecs(createStandaloneServer(installation, mimimumStability, null));
                 Boolean all = Boolean.getBoolean("org.wildfly.galleon.complete.model");
-                ModelNode result = generateModel(createStandaloneServer(installation, mimimumStability, all ? "standalone.xml" : "standalone-local.xml"), all);
+                ModelNode result = generateModel(createStandaloneServer(installation, mimimumStability, all ? "standalone.xml" : "standalone-local.xml"), all, description);
                 try {
                     if (!Files.exists(outputDir)) {
                         Files.createDirectories(outputDir);
@@ -248,17 +250,18 @@ private void doGenerate() throws ProvisioningException {
 
     @Override
     public void forkedForEmbedded(String... args) throws ConfigGeneratorException {
-        if (args.length != 3 && args.length != 4) {
+        if(args.length != 4 && args.length != 5) {
             final StringBuilder buf = new StringBuilder();
             StringUtils.append(buf, Arrays.asList(args));
-            throw new IllegalArgumentException("Expected 3-4 arguments but got " + Arrays.asList(args));
+            throw new IllegalArgumentException("Expected 4-5 arguments but got " + Arrays.asList(args));
         }
         try {
-            String mimimumStability = args.length == 4 ? args[3] : null;
+            String description = args.length > 3 ? args[3] : null;
+            String mimimumStability = args.length == 5 ? args[4] : null;
             ModelNode result = readFeatureSpecs(createStandaloneServer(args[0], mimimumStability, null));
             writeSpecsFile(Paths.get(args[1]), result);
             Boolean all = Boolean.getBoolean("org.wildfly.galleon.complete.model");
-            ModelNode resultModel = generateModel(createStandaloneServer(args[0], mimimumStability, all ? "standalone.xml" : "standalone-local.xml"), all);
+            ModelNode resultModel = generateModel(createStandaloneServer(args[0], mimimumStability, all ? "standalone.xml" : "standalone-local.xml"), all, description);
             writeModelFile(Paths.get(args[1]).toAbsolutePath().getParent().resolve("model.json"), resultModel);
             System.out.println("FORKED TO " + Paths.get(args[1]).toAbsolutePath().getParent().resolve("model.json"));
             if (Files.exists(Paths.get(args[0]).resolve(WfConstants.DOMAIN).resolve(WfConstants.CONFIGURATION))) {
@@ -346,37 +349,41 @@ private static String[] getCmdArgs(String mimimumStability, String serverConfig)
         return args.toArray(String[]::new);
     }
 
-    private static ModelNode generateModel(final EmbeddedManagedProcess server, Boolean all) throws ProvisioningException {
+    private static ModelNode generateModel(final EmbeddedManagedProcess server, Boolean all, String description) throws ProvisioningException {
         try {
             server.start();
             if (!all) {
-                return readModel(server);
+                return readModel(server, description);
             }
-            return readAll(server);
+            return readAll(server, description);
         } catch (EmbeddedProcessStartException ex) {
             throw new ProvisioningException("Failed to read feature spec descriptions", ex);
         } finally {
             server.stop();
         }
     }
 
-    private static ModelNode readModel(final EmbeddedManagedProcess server) throws ProvisioningException {
+    private static ModelNode readModel(final EmbeddedManagedProcess server, String description) throws ProvisioningException {
         List<String> subsystems = listSubsystems(server);
-        ModelNode result = new ModelNode();
+        ModelNode result = new ModelNode().setEmptyObject();
         ModelNode subsystemNodes = result.get("children").get(ClientConstants.SUBSYSTEM).get("model-description");
-        for (String subsystem : subsystems) {
+        for(String subsystem : subsystems) {
             ModelNode address = Operations.createAddress(ClientConstants.SUBSYSTEM, subsystem);
-            ModelNode subsystemDescription = readResourceDescription(server, address);
+            ModelNode subsystemDescription = readResourceDescription(server, address, true);
             subsystemDescription.get(ClientConstants.ADDRESS).add(address);
             subsystemNodes.get(subsystem).set(subsystemDescription);
         }
         ModelNode address = Operations.createAddress(ClientConstants.DEPLOYMENT);
-        result.get("children").get(ClientConstants.DEPLOYMENT).get("model-description").get("*").set(readResourceDescription(server, address));
+        result.get("children").get(ClientConstants.DEPLOYMENT).get("model-description").get("*").set(readResourceDescription(server, address, true));
         result.remove(ClientConstants.RESULT);
+        ModelNode subsystemsDescription = readResourceDescription(server, Operations.createAddress().setEmptyList(), false);
+        result.get("children").get(ClientConstants.SUBSYSTEM).get("description").set(subsystemsDescription.get("children").get(ClientConstants.SUBSYSTEM).get("description"));
+        result.get("children").get(ClientConstants.DEPLOYMENT).get("description").set(subsystemsDescription.get("children").get(ClientConstants.DEPLOYMENT).get("description"));
+        result.get("description").set(description);
         return result;
     }
 
-    private static ModelNode readAll(final EmbeddedManagedProcess server) throws ProvisioningException {
+    private static ModelNode readAll(final EmbeddedManagedProcess server, String description) throws ProvisioningException {
         ModelNode rootAddress = Operations.createAddress().setEmptyList();
         final ModelNode op = Operations.createOperation("read-resource-description", rootAddress);
         op.get(ClientConstants.RECURSIVE).set(true);
@@ -389,7 +396,9 @@ private static ModelNode readAll(final EmbeddedManagedProcess server) throws Pro
         if (!Operations.isSuccessfulOutcome(result)) {
             throw new ProvisioningException(Operations.getFailureDescription(result).asString());
         }
-        return result.get(ClientConstants.RESULT);
+        final ModelNode  effectiveResult = result.get(ClientConstants.RESULT);
+        effectiveResult.get("description").set(description);
+        return effectiveResult;
     }
 
     private static List<String> listSubsystems(final EmbeddedManagedProcess server) throws ProvisioningException {
@@ -413,9 +422,9 @@ private static List<String> listSubsystems(final EmbeddedManagedProcess server)
         return names;
     }
 
-    private static ModelNode readResourceDescription(final EmbeddedManagedProcess server, ModelNode address) throws ProvisioningException {
+    private static ModelNode readResourceDescription(final EmbeddedManagedProcess server, ModelNode address, boolean recursive) throws ProvisioningException {
         final ModelNode op = Operations.createOperation("read-resource-description", address);
-        op.get(ClientConstants.RECURSIVE).set(true);
+        op.get(ClientConstants.RECURSIVE).set(recursive);
         final ModelNode opResult;
         try {
             opResult = server.getModelControllerClient().execute(op);

maven-plugin/src/main/java/org/wildfly/galleon/maven/FeatureSpecGeneratorInvoker.java

@@ -102,28 +102,29 @@ public class FeatureSpecGeneratorInvoker {
         TASKS_XML_PATH_END = pmWf + File.separator + WfConstants.TASKS_XML;
     }
 
-    private MavenProject project;
-    private MavenSession session;
-    private List<RemoteRepository> repositories;
-    private RepositorySystem repoSystem;
-    private ArtifactResolver artifactResolver;
-    private WildFlyFeaturePackBuild buildConfig;
-    private Log log;
-
-    private File featureSpecsOutput;
-    private boolean forkEmbedded;
-    private Path wildflyHome;
-    private Path moduleTemplatesDir;
-
-    private Map<String, Artifact> mergedArtifacts = new HashMap<>();
-    private Map<String, Map<String, Artifact>> moduleTemplates = new HashMap<>();
+    private final MavenProject project;
+    private final MavenSession session;
+    private final List<RemoteRepository> repositories;
+    private final RepositorySystem repoSystem;
+    private final ArtifactResolver artifactResolver;
+    private final WildFlyFeaturePackBuild buildConfig;
+    private final Log log;
+
+    private final File featureSpecsOutput;
+    private final boolean forkEmbedded;
+    private final Path wildflyHome;
+    private final Path moduleTemplatesDir;
+
+    private final Map<String, Artifact> mergedArtifacts = new HashMap<>();
+    private final Map<String, Map<String, Artifact>> moduleTemplates = new HashMap<>();
 
     private Map<String, Path> inheritedFeatureSpecs = Collections.emptyMap();
     private Set<String> standaloneExtensions = Collections.emptySet();
     private Set<String> domainExtensions = Collections.emptySet();
     private Set<String> hostExtensions = Collections.emptySet();
     private List<Path> layersConfs = Collections.emptyList();
-    private String minimumStabilityLevel;
+    private final String minimumStabilityLevel;
+    private final String description;
 
     private WildFlyPackageTasksParser tasksParser;
     private ProvisioningLayoutFactory layoutFactory;
@@ -140,6 +141,7 @@ public class FeatureSpecGeneratorInvoker {
         this.wildflyHome = mojo.wildflyHome.toPath();
         this.moduleTemplatesDir = mojo.moduleTemplatesDir.toPath();
         this.minimumStabilityLevel = mojo.minimumStabilityLevel;
+        this.description = this.project.getDescription() == null || this.project.getDescription().isBlank() ? this.project.getName() : this.project.getDescription();
         this.log = mojo.getLog();
     }
 
@@ -490,7 +492,7 @@ private void processFeaturePackDep(MavenProjectArtifactVersions artifactVersions
             try(DirectoryStream<Path> stream = Files.newDirectoryStream(p)) {
                 for(Path path : stream) {
                     String specName = path.getFileName().toString();
-                    if(specName.charAt(specName.length() - 1) == '/') {
+                    if (specName.charAt(specName.length() - 1) == '/') {
                         specName = specName.substring(0, specName.length() - 1);
                     }
                     path = path.resolve(Constants.SPEC_XML);
@@ -737,15 +739,20 @@ private void debug(String format, Object... args) {
     private Object getFeaturePackGenerator(Class<?> specGenCls) throws NoSuchMethodException, InvocationTargetException, InstantiationException, IllegalAccessException {
         debug("Creating a feature spec generator for stability %s using %s", minimumStabilityLevel, specGenCls);
         try {
-            return specGenCls.getConstructor(String.class, Path.class, Map.class, String.class, boolean.class, boolean.class)
-                    .newInstance(wildflyHome.toString(), featureSpecsOutput.toPath(), inheritedFeatureSpecs, minimumStabilityLevel, forkEmbedded, log.isDebugEnabled());
+            return specGenCls.getConstructor(String.class, Path.class, Map.class, String.class, String.class, boolean.class, boolean.class)
+                    .newInstance(wildflyHome.toString(), featureSpecsOutput.toPath(), inheritedFeatureSpecs, minimumStabilityLevel, description, forkEmbedded, log.isDebugEnabled());
         } catch (NoSuchMethodException e) {
-            if (minimumStabilityLevel != null && !minimumStabilityLevel.isEmpty()) {
-                return specGenCls.getConstructor(String.class, Path.class, Map.class, boolean.class, boolean.class)
-                        .newInstance(wildflyHome.toString(), featureSpecsOutput.toPath(), inheritedFeatureSpecs, forkEmbedded, log.isDebugEnabled());
-            } else {
-                // We've been configured to use a stability but the generator class does not support it
-                throw e;
+            try {
+                return specGenCls.getConstructor(String.class, Path.class, Map.class, String.class, String.class, String.class, boolean.class, boolean.class)
+                        .newInstance(wildflyHome.toString(), featureSpecsOutput.toPath(), inheritedFeatureSpecs, minimumStabilityLevel, forkEmbedded, log.isDebugEnabled());
+            } catch (NoSuchMethodException ex) {
+                if (minimumStabilityLevel != null && !minimumStabilityLevel.isEmpty()) {
+                    return specGenCls.getConstructor(String.class, Path.class, Map.class, boolean.class, boolean.class)
+                            .newInstance(wildflyHome.toString(), featureSpecsOutput.toPath(), inheritedFeatureSpecs, forkEmbedded, log.isDebugEnabled());
+                } else {
+                    // We've been configured to use a stability but the generator class does not support it
+                    throw ex;
+                }
             }
         }
     }