From 2ddf897f897960c2ac6b5054e7a4250c9921b934 Mon Sep 17 00:00:00 2001
From: Robert Butora <robert.butora@inaf.it>
Date: Mon, 11 Nov 2024 23:19:22 +0100
Subject: [PATCH] cutout: removes from settings 'defaults'
---
.../src/main/java/common/webapi/Settings.java | 29 +++----------------
.../java/cutout/webapi/ServletCutout.java | 12 +++-----
.../main/java/vlkb/webapi/UWSMergeWork.java | 2 --
3 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/data-access/servlet/src/main/java/common/webapi/Settings.java b/data-access/servlet/src/main/java/common/webapi/Settings.java
index b21f997..16c0ede 100644
--- a/data-access/servlet/src/main/java/common/webapi/Settings.java
+++ b/data-access/servlet/src/main/java/common/webapi/Settings.java
@@ -33,6 +33,7 @@ class Settings
}
+ // DEPRECATED used only in Resolver / resolveByDb
public static class DBConn
{
private String uri;
@@ -57,15 +58,7 @@ class Settings
}
- public static class DefaultParamValues
- {
- String responseFormat;
- String skySystem;
- String specSystem;
- boolean showDuration;
- }
-
-
+ // DEPRECATED
public static class AmqpConn
{
private String hostName;
@@ -90,7 +83,6 @@ class Settings
public FITSPaths fitsPaths;
public DBConn dbConn;
public AmqpConn amqpConn;
- public DefaultParamValues defaults;
// will not start without config-file
@@ -111,9 +103,8 @@ class Settings
FITSPaths fitsPaths = loadFITSPaths(properties);
DBConn dbConn = loadDBConn(properties);
AmqpConn amqpConn = loadAmqpConn(properties);
- DefaultParamValues defaults = loadDefaults(properties);
- return new Settings(dbConn, amqpConn, fitsPaths, defaults);
+ return new Settings(dbConn, amqpConn, fitsPaths);
}
else
{
@@ -130,12 +121,11 @@ class Settings
private Settings(DBConn dbConn, AmqpConn amqpConn,
- FITSPaths fitsPaths, DefaultParamValues defaults)
+ FITSPaths fitsPaths)
{
this.fitsPaths = fitsPaths;
this.dbConn = dbConn;
this.amqpConn = amqpConn;
- this.defaults = defaults;
}
@@ -147,7 +137,6 @@ class Settings
fitspaths.FITScutpath = properties.getProperty("fits_path_cutouts", "/srv/cutouts").strip();
fitspaths.FITSRemoteUrlCutouts = properties.getProperty("fits_url_cutouts", "").strip();
fitspaths.surveysMetadataAbsPathname = properties.getProperty("surveys_metadata_abs_pathname", "").strip();
- //fitspaths.surveysMetadataAbsPathname = properties.getProperty("surveys_metadata_abs_pathname", "/srv/surveys/survey_populate.csv").strip();
return fitspaths;
}
@@ -161,16 +150,6 @@ class Settings
return dbconn;
}
- private static DefaultParamValues loadDefaults(Properties properties)
- {
- DefaultParamValues defaults = new DefaultParamValues();
- defaults.responseFormat = properties.getProperty("default_response_format", "application/fits").strip();
- defaults.skySystem = properties.getProperty("default_sky_system", "ICRS").strip();
- defaults.specSystem = properties.getProperty("default_spec_system", "WAVE_Barycentric").strip();
- defaults.showDuration = "yes".equals(properties.getProperty("show_duration", "no").strip());
- return defaults;
- }
-
private static AmqpConn loadAmqpConn(Properties properties)
{
AmqpConn amqpconn = new AmqpConn();
diff --git a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
index 34585c6..f474100 100644
--- a/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
+++ b/data-access/servlet/src/main/java/cutout/webapi/ServletCutout.java
@@ -56,17 +56,13 @@ public class ServletCutout extends HttpServlet
protected boolean useEngineOverCli = settings.amqpConn.isHostnameEmpty();
final String RESPONSE_ENCODING = "utf-8";
- final String DEFAULT_RESPONSEFORMAT = settings.defaults.responseFormat;
-// final String DEFAULT_SKY_SYSTEM = settings.defaults.skySystem;
-// final String DEFAULT_SPEC_SYSTEM = settings.defaults.specSystem;
-// final String DEFAULT_TIME_SYSTEM = "MJD_UTC"; // FIXME take from confif file
+ final String DEFAULT_RESPONSEFORMAT = "application/fits";
public void init() throws ServletException
{
- LOGGER.config("FITS : " + settings.fitsPaths.toString());
+ LOGGER.config("FITS : " + settings.fitsPaths.toString());
if(subsurveys != null)
LOGGER.config("Subsurveys loaded : " + String.valueOf(subsurveys.length));
- // LOGGER.config("DEFAULT SKY/SPEC/TIME SYSTEM : " + DEFAULT_SKY_SYSTEM + " / " + DEFAULT_SPEC_SYSTEM + " / " + DEFAULT_TIME_SYSTEM);
LOGGER.config("DEFAULT_RESPONSEFORMAT : " + DEFAULT_RESPONSEFORMAT);
LOGGER.config("Resolver : " + (resolveFromId ? "IVOID" : "DB"));
LOGGER.config("Engine : " + (useEngineOverCli ? "CLI" : "AMQP"));
@@ -229,7 +225,6 @@ public class ServletCutout extends HttpServlet
throws ServletException, IOException, UnsupportedEncodingException
{
- boolean showDuration = settings.defaults.showDuration;
long startTime_msec = System.currentTimeMillis();
long startTime_nsec = System.nanoTime();
@@ -257,7 +252,8 @@ public class ServletCutout extends HttpServlet
}
else if(respFormat.startsWith("application/x-vlkb+xml"))
{
- boolean countNullValues = vlkbReq_getNullValues(request);
+ boolean showDuration = true;
+ boolean countNullValues = vlkbReq_getNullValues(request);
response.setContentType(respFormat);
CutResult cutResult = doCutoutFile(id, pos, band, time, pol, pixels, countNullValues);// FIXME wh? , respFormat);
diff --git a/data-access/servlet/src/main/java/vlkb/webapi/UWSMergeWork.java b/data-access/servlet/src/main/java/vlkb/webapi/UWSMergeWork.java
index 426b7eb..c8d7b91 100644
--- a/data-access/servlet/src/main/java/vlkb/webapi/UWSMergeWork.java
+++ b/data-access/servlet/src/main/java/vlkb/webapi/UWSMergeWork.java
@@ -30,8 +30,6 @@ public class UWSMergeWork extends JobThread
private Settings settings = UWSMerge.settings;
final String RESPONSE_ENCODING = "utf-8";
- final String DEFAULT_RESPONSEFORMAT = settings.defaults.responseFormat;
- final String DEFAULT_TIME_SYSTEM = "MJD_UTC";
protected Vlkb vlkb = ( settings.amqpConn.isHostnameEmpty() ? new VlkbCli(settings): new VlkbAmqp(settings) );
--
GitLab