Merge pull request #1807 from Caltech-IPAC/FIREFLY-1794-params

Firefly-1794: parse parameters

Author: robyww

docs/release-notes.md

@@ -8,7 +8,8 @@
 
 
 ## Version 2025.3
-- 2025.3.5 - (July 1, 2025), _docker tag_: `2025.3.5`, `2025.3`, `latest`
+- 2025.3.6 - (July 3, 2025), _docker tag_: `2025.3.6`, `2025.3`, `latest`
+- 2025.3.5 - (July 1, 2025), _docker tag_: `2025.3.5`
 - 2025.3.4 - (June 26, 2025), _docker tag_: `2025.3.4`
 - 2025.3.3 - (June 20, 2025), _docker tag_: `2025.3.3`
 - 2025.3.2 - (June 16, 2025), _docker tag_: `2025.3.2`
@@ -74,6 +75,8 @@
 
 
 ### _Patches 2025.3_
+- 2025.3.6
+  - Handle Importing job histories URL that have parameters : - Firefly-1794  ([PR](https://github.com/Caltech-IPAC/firefly/pull/1807))
 - 2025.3.5
   - Fixed: Images: mouse readout with some compressed images- Firefly-1793,Firefly-1792,Firefly-1789  ([PR](https://github.com/Caltech-IPAC/firefly/pull/1804))
 - 2025.3.4 

src/firefly/java/edu/caltech/ipac/firefly/core/background/JobUtil.java

@@ -13,6 +13,8 @@
 
 import java.io.File;
 import java.net.InetAddress;
+import java.net.URL;
+import java.net.URI;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -22,14 +24,17 @@
 import java.util.stream.Collectors;
 
 import static edu.caltech.ipac.firefly.core.Util.Opt.ifNotNull;
+import static edu.caltech.ipac.firefly.core.Util.Try;
 import static edu.caltech.ipac.firefly.core.background.JobInfo.*;
 import static edu.caltech.ipac.firefly.core.background.JobInfo.Phase.COMPLETED;
-import static edu.caltech.ipac.firefly.core.background.JobInfo.Phase.ERROR;
 import static edu.caltech.ipac.firefly.core.background.JobManager.getAllUserJobs;
 import static edu.caltech.ipac.firefly.core.background.JobManager.updateJobInfo;
-import static edu.caltech.ipac.firefly.server.query.UwsJobProcessor.*;
-import static edu.caltech.ipac.util.StringUtils.*;
-import static edu.caltech.ipac.firefly.core.Util.Try;
+import static edu.caltech.ipac.firefly.server.query.UwsJobProcessor.convertToJobList;
+import static edu.caltech.ipac.firefly.server.query.UwsJobProcessor.getUwsJobInfo;
+import static edu.caltech.ipac.firefly.server.query.UwsJobProcessor.parse;
+import static edu.caltech.ipac.util.StringUtils.applyIfNotEmpty;
+import static edu.caltech.ipac.util.StringUtils.getInt;
+import static edu.caltech.ipac.util.StringUtils.isEmpty;
 
 public class JobUtil {
     // Services are defined as strings with three fields (url|serviceId|serviceType), separated by commas. Only url is required; the others are optional.
@@ -97,18 +102,22 @@ public static int importJobHistories(String svcDef) {
         String url = svcParts[0].trim();
         String svcId = svcParts.length > 1 ? svcParts[1].trim() : null;
         String svcType = svcParts.length > 2 ? svcParts[2].trim() : null;
-
         if (url.isEmpty()) return count;
 
-        LOG.debug("Importing job histories from %s; svcId=%s svcType=%s".formatted(url, svcId, svcType));
+        URL urlObs= Try.it(() -> new URI(url).toURL()).getOrElse((URL)null);
+        String paramStr= urlObs == null ? "" : urlObs.getQuery();
+        String urlBase= (!isEmpty(paramStr) && url.contains("?"))  ? url.split("\\?")[0] : url;
+
         List<JobInfo> history = getAllUserJobs();
 
-        HttpServiceInput input = HttpServiceInput.createWithCredential(url);
+        HttpServiceInput input = HttpServiceInput.createWithCredential(urlBase);
+        if (!isEmpty(paramStr)) input.setRequestUrl(input.getRequestUrl()+"?"+paramStr);
+        LOG.info("Importing job histories from %s; svcId=%s svcType=%s".formatted(input.getRequestUrl(), svcId, svcType));
         Ref<List<JobInfo>> jobList = new Ref<>();
         HttpServices.getData(input, r -> {
            Try.it(() -> {
                 Document doc = parse(r.getResponseBodyAsStream());
-                jobList.set(convertToJobList(doc, url));
+                jobList.set(convertToJobList(doc, urlBase));
             }).getOrElse(e -> {
                 LOG.error("Failed to import job histories from %s: %s".formatted(url, e.getMessage()));
             });

src/firefly/java/edu/caltech/ipac/firefly/server/RequestOwner.java

@@ -265,7 +265,7 @@ private void notifyClient(UserInfo userInfo) {
             action.setValue(getSsoAdapter().getLoginUrl(""), "login_url");
             action.setValue(getSsoAdapter().getLogoutUrl(""), "logout_url");
         }
-        LOG.info("notifyClient new User info: " + userInfo);
+        LOG.debug("notifyClient new User info: " + userInfo);
         ServerEventManager.fireAction(action);
     }
 

src/firefly/java/edu/caltech/ipac/firefly/server/servlets/CommandService.java

@@ -74,7 +74,7 @@ protected void processRequest(HttpServletRequest req, HttpServletResponse res) t
                 var ui= sso.getUserInfo();
                 if (ui!=null) userInfoStr= ui.toString();
             }
-            Logger.briefInfo(String.format("CommandService: %s (%s): %dms", cmd, userInfoStr, System.currentTimeMillis() - start));
+            Logger.debug(String.format("CommandService: %s (%s): %dms", cmd, userInfoStr, System.currentTimeMillis() - start));
         } catch (Exception ex) {
             LOGGER.error(ex);
             HashMap<String, String> errors = new HashMap<>();