DM-7829: more cleanup, use local file in unit test instead.

Author: ejoliet

config/app.config

@@ -56,9 +56,6 @@ visualize.fits.Security= true
 // IRSA Periodogram API
 irsa.gator.service.periodogram.url = "http://bacchus.ipac.caltech.edu:9027/cgi-bin/periodogram/nph-periodogram_api"
 
-// Periodogram API request parameter list definition, separated by space
-irsa.gator.service.periodogram.keys = "x y alg step_method pmin pmax step_size peaks"
-
 environments{
     local {
         visualize.fits.search.path = "/Library/WebServer/Documents:/irsadata:/hydra"

src/firefly/config/app.prop

@@ -28,5 +28,5 @@ python.exe= @python.exe@
 # IRSA Periodogram API
 irsa.gator.service.periodogram.url=@irsa.gator.service.periodogram.url@
 
-# Periodogram API request parameter list definition, separated by space
-irsa.gator.service.periodogram.keys=@irsa.gator.service.periodogram.keys@
+// Periodogram API request parameter list definition, separated by space
+irsa.gator.service.periodogram.keys=x y alg step_method pmin pmax step_size peaks

src/firefly/java/edu/caltech/ipac/firefly/server/query/lc/LightCurveProcessor.java

@@ -82,7 +82,6 @@ protected File loadDataFile(TableServerRequest request) throws IOException, Data
      */
     public File computePeriodogram(PeriodogramAPIRequest req, String tblName) throws FailedRequestException {
 
-//        LightCurveHandler h = new IrsaLightCurveHandler();
         if (tblName.equalsIgnoreCase(PERIODOGRAM_TABLE_NAME)) {
             return h.getPeriodogramTable(req);
         } else if (tblName.equalsIgnoreCase(PEAKS_TABLE_NAME)) {
@@ -91,31 +90,4 @@ public File computePeriodogram(PeriodogramAPIRequest req, String tblName) throws
             throw new FailedRequestException("Unable to deal with the request table name " + tblName);
         }
     }
-
-    private static File makeFileName(PeriodogramAPIRequest req) throws IOException {
-        return File.createTempFile("lc-result", ".xml", ServerContext.getPermWorkDir());
-    }
-
-    private URL createURL(PeriodogramAPIRequest req) throws EndUserException, IOException {
-        PeriodogramAPIRequest request = (PeriodogramAPIRequest) req.cloneRequest();
-        String url = req.getUrl();
-        if (url == null || url.length() < 5) {
-            url = PERIODOGRAM_API_URL;
-        }
-        String paramStr = buildParamFrom(request);
-        if (paramStr.startsWith("&")) {
-            paramStr = paramStr.substring(1);
-        }
-        url += "?" + paramStr;
-
-        return new URL(url);
-    }
-
-    private String buildParamFrom(PeriodogramAPIRequest request) {
-        String outputMode = request.getParam(PeriodogramAPIRequest.OUTPUT_MODE);
-        if (StringUtils.isEmpty(outputMode)) {
-            outputMode = "VOTable";
-        }
-        return "pmin=0&peaks=50";
-    }
 }

src/firefly/java/edu/caltech/ipac/firefly/server/query/lc/PeriodogramAPIRequest.java

@@ -46,10 +46,6 @@ public PeriodogramAPIRequest() {
         super(PeriodogramAPIRequest.class.getSimpleName());
     }
 
-    public String getUrl() {
-        return getParam(URL);
-    }
-
     /**
      * Period value
      *

src/firefly/js/templates/lightcurve/LcPhaseFoldingPanel.jsx

@@ -457,16 +457,4 @@ function getPeriodFromTable(tbl_id) {
     } else if (tbl_id === PEAK_TABLE) {
         return getCellValue(tableModel, tableModel.highlightedRow, 'Period');
     }
-}
-
-/**
- * return true if the table is LC raw or phase folded table
- * @param {string} tbl_id
- * @returns
- */
-function isLcTable(tbl_id) {
-    const tableModel = getTblById(tbl_id);
-    if (!tableModel || isNil(tableModel.highlightedRow)) return;
-    return !![RAW_TABLE, PHASE_FOLDED].includes(tbl_id);
-
 }

src/firefly/test/edu/caltech/ipac/firefly/server/query/LightCurveProcessorTest.java

@@ -9,21 +9,16 @@
 import edu.caltech.ipac.firefly.server.query.lc.IrsaLightCurveHandler;
 import edu.caltech.ipac.firefly.server.query.lc.LightCurveHandler;
 import edu.caltech.ipac.firefly.server.query.lc.PeriodogramAPIRequest;
-import edu.caltech.ipac.util.AppProperties;
+import edu.caltech.ipac.firefly.util.FileLoader;
 import edu.caltech.ipac.util.DataGroup;
 import edu.caltech.ipac.util.DataObject;
 import edu.caltech.ipac.util.DataType;
-import edu.caltech.ipac.util.download.FailedRequestException;
-import edu.caltech.ipac.util.download.URLDownload;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
 import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
 import java.util.List;
 
 /**
@@ -33,17 +28,11 @@ public class LightCurveProcessorTest extends ConfigTest {
 
 
     private static PeriodogramAPIRequestTest req;
-    private static File rawTable;
 
 
     @BeforeClass
     public static void setUp() {
         req = new PeriodogramAPIRequestTest();
-        try {
-            rawTable = File.createTempFile("phasefolded-temp-", ".tbl", new File("."));
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
     }
 
     @Test
@@ -128,21 +117,8 @@ protected File makeApiResultTempFile() throws IOException {
     @Test
     public void testPhaseFoldedCurve() {
 
-        try {
-            URL demo = new URL("http://web.ipac.caltech.edu/staff/ejoliet/demo/AllWISE-MEP-m82-2targets-10arsecs.tbl");
-            URLConnection uc = URLDownload.makeConnection(demo);
-            URLDownload.getDataToFile(uc, rawTable);
-        } catch (MalformedURLException e) {
-            e.printStackTrace();
-        } catch (FailedRequestException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        File rlc = FileLoader.resolveFile(LightCurveProcessorTest.class, "/AllWISE-MEP-m82-2targets-10arsecs-oneTarget.tbl");
         boolean deleteOnExit = true;
-        if (deleteOnExit) {
-            rawTable.deleteOnExit();
-        }
         IrsaLightCurveHandler t = new IrsaLightCurveHandler() {
             @Override
             protected File createPhaseFoldedTempFile() throws IOException {
@@ -156,14 +132,14 @@ protected File createPhaseFoldedTempFile() throws IOException {
 
         DataGroup inDataGroup = null;
         try {
-            inDataGroup = IpacTableReader.readIpacTable(rawTable, "lc_raw");
+            inDataGroup = IpacTableReader.readIpacTable(rlc, "lc_raw");
         } catch (IpacTableException e) {
             e.printStackTrace();
         }
         List<DataObject> dgjListOrigin = inDataGroup.values();
         DataType[] inColumns = inDataGroup.getDataDefinitions();
 
-        File p = t.toPhaseFoldedTable(rawTable, req.getPeriod(), req.getTimeColName());
+        File p = t.toPhaseFoldedTable(rlc, req.getPeriod(), req.getTimeColName());
 
         try {
             inDataGroup = IpacTableReader.readIpacTable(p, "phasefolded");
@@ -196,7 +172,7 @@ static class PeriodogramAPIRequestTest extends PeriodogramAPIRequest {
         private int n_peaks = 52;
         // Fake values passed from client,
         // see test properties irsa.gator.service.periodogram.keys
-        private final String[] reqValues = new String[]{"x=mjd", "y=w1mpro_ep", "peaks="+n_peaks, "alg=ls"};
+        private final String[] reqValues = new String[]{"x=mjd", "y=w1mpro_ep", "peaks=" + n_peaks, "alg=ls"};
 
         @Override
         public String getParam(String param) {
@@ -235,15 +211,6 @@ public String getTimeColName() {
             return "mjd";
         }
 
-        /**
-         * @return the built url api
-         */
-        @Override
-        public String getUrl() {
-            //As for the test, we return the result table
-            return getResultTable();
-        }
-
         @Override
         public String getResultTable() {
             return "http://web.ipac.caltech.edu/staff/ejoliet/demo/vo-nexsci-result-sample-old.xml";