Merge pull request #25669 from avpinchuk/detach

Fixes processing of the detached admin commands

Author: arjantijms

nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/TemplateExecCommand.java

@@ -136,7 +136,7 @@ protected final Response executeSseCommand(ParameterMap params) {
             .getCommandInvocation(null, commandName, new RestActionReporter(), null, notify, detach).parameters(params);
         final ResponseBuilder builder = Response.status(HTTP_OK);
         final AsyncAdminCommandInvoker<Response> invoker = detach
-            ? new DetachedSseAdminCommandInvoker(new RestActionReporter(), invocation, builder)
+            ? new DetachedSseAdminCommandInvoker(invocation, builder)
             : new SseAdminCommandInvoker(invocation, builder);
         return invoker.start();
     }

nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/resources/admin/CommandResource.java

@@ -331,7 +331,7 @@ private Response executeSseCommand(CommandName commandName, Payload.Inbound inbo
             builder.cookie(getJSessionCookie(jSessionId));
         }
         final AsyncAdminCommandInvoker<Response> invoker = detach
-            ? new DetachedSseAdminCommandInvoker(new PropsFileActionReporter(), invocation, builder)
+            ? new DetachedSseAdminCommandInvoker(invocation, builder)
             : new SseAdminCommandInvoker(invocation, builder);
         return invoker.start();
     }

nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/DetachedSseAdminCommandInvoker.java

@@ -18,16 +18,17 @@
 
 import com.sun.enterprise.v3.admin.AdminCommandJob;
 import com.sun.enterprise.v3.admin.AsyncAdminCommandInvoker;
-import com.sun.enterprise.v3.common.ActionReporter;
+import com.sun.enterprise.v3.common.PropsFileActionReporter;
 
 import jakarta.ws.rs.core.Response;
 import jakarta.ws.rs.core.Response.ResponseBuilder;
 
 import java.lang.System.Logger;
 
 import org.glassfish.api.ActionReport;
-import org.glassfish.api.ActionReport.ExitCode;
+import org.glassfish.api.admin.AdminCommandState;
 import org.glassfish.api.admin.CommandInvocation;
+import org.glassfish.api.admin.Job;
 
 import static java.lang.System.Logger.Level.TRACE;
 
@@ -38,12 +39,10 @@
 public class DetachedSseAdminCommandInvoker extends AsyncAdminCommandInvoker<Response> {
     private static final Logger LOG = System.getLogger(DetachedSseAdminCommandInvoker.class.getName());
 
-    private final ActionReporter report;
     private final ResponseBuilder builder;
 
-    public DetachedSseAdminCommandInvoker(ActionReporter idReport, CommandInvocation<AdminCommandJob> invocation, ResponseBuilder builder) {
+    public DetachedSseAdminCommandInvoker(CommandInvocation<AdminCommandJob> invocation, ResponseBuilder builder) {
         super(invocation);
-        this.report = idReport;
         this.builder = builder;
     }
 
@@ -54,8 +53,6 @@ public DetachedSseAdminCommandInvoker(ActionReporter idReport, CommandInvocation
     @Override
     public Response start() {
         final AdminCommandJob job = getJob();
-        report.setMessage(job.getId());
-        report.setActionExitCode(ExitCode.SUCCESS);
         final Response response = createResponse(job);
         LOG.log(TRACE, "Job parameters: {0}, this: {1}", job.getParameters(), this);
         startJob();
@@ -64,10 +61,51 @@ public Response start() {
     }
 
     private Response createResponse(AdminCommandJob job) {
-        try (SseEventOutput eventOutput = new SseEventOutput(job)) {
+        try (SseEventOutput eventOutput = new SseEventOutput(new DetachedAdminCommandState(job))) {
             LOG.log(TRACE, "Writing the job id. {0}", this);
             eventOutput.write();
             return builder.entity(eventOutput).build();
         }
     }
+
+    private static final class DetachedAdminCommandState implements AdminCommandState {
+
+        private final String id;
+        private final String name;
+        private final State state;
+
+        DetachedAdminCommandState(Job job) {
+            this.id = job.getId();
+            this.name = job.getName();
+            this.state = job.getState();
+        }
+
+        @Override
+        public String getId() {
+            return id;
+        }
+
+        @Override
+        public String getName() {
+            return name;
+        }
+
+        @Override
+        public State getState() {
+            return state;
+        }
+
+        @Override
+        public ActionReport getActionReport() {
+            ActionReport actionReport = new PropsFileActionReporter();
+            actionReport.setActionDescription(name + " command");
+            actionReport.setActionExitCode(ActionReport.ExitCode.SUCCESS);
+            return actionReport;
+        }
+
+        @Override
+        public boolean isOutboundPayloadEmpty() {
+            return true;
+        }
+    }
 }

nucleus/admin/rest/rest-service/src/main/java/org/glassfish/admin/rest/utils/SseEventOutput.java

@@ -21,7 +21,7 @@
 import java.io.IOException;
 import java.lang.System.Logger;
 
-import org.glassfish.api.admin.Job;
+import org.glassfish.api.admin.AdminCommandState;
 import org.glassfish.api.admin.ProgressEvent;
 import org.glassfish.jersey.media.sse.EventOutput;
 import org.glassfish.jersey.media.sse.OutboundEvent;
@@ -31,15 +31,15 @@
 import static org.glassfish.api.admin.AdminCommandState.EVENT_STATE_CHANGED;
 
 /**
- * A special {@link EventOutput} for sending Server Side Events related to the {@link Job}.
+ * A special {@link EventOutput} for sending Server Side Events related to the {@link AdminCommandState}.
  */
 public class SseEventOutput extends EventOutput {
     private static final Logger LOG = System.getLogger(SseEventOutput.class.getName());
 
-    private final Job job;
+    private final AdminCommandState state;
 
-    SseEventOutput(Job job) {
-        this.job = job;
+    SseEventOutput(AdminCommandState state) {
+        this.state = state;
     }
 
     void write(String eventName, ProgressEvent event) {
@@ -50,7 +50,7 @@ void write(String eventName, ProgressEvent event) {
 
     void write() {
         if (!isClosed()) {
-            writeJson(EVENT_STATE_CHANGED, job);
+            writeJson(EVENT_STATE_CHANGED, state);
         }
     }