Skip to content

cadc-sia: fix sia2 package to use config file file sia.properties #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pdowler merged 1 commit into from
May 11, 2026
Merged

cadc-sia: fix sia2 package to use config file file sia.properties #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions cadc-sia/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,15 @@ sourceCompatibility = 11

group = 'org.opencadc'

version = '1.1.15'
version = '1.1.16'

description = 'OpenCADC SIA server library'
def git_url = 'https://github.com/opencadc/dal'

dependencies {
implementation 'org.jdom:jdom2:[2.0,)'

api 'org.opencadc:cadc-dali:[1.2.4,)'
implementation 'org.opencadc:cadc-registry:[1.5.0,)'
implementation 'org.opencadc:cadc-util:[1.6,)'
api 'org.opencadc:cadc-util:[1.6,)'
api 'org.opencadc:cadc-rest:[1.4.5,)'
api 'org.opencadc:cadc-uws:[1.0,)'
api 'org.opencadc:cadc-uws-server:[1.2,)'
Expand Down
21 changes: 10 additions & 11 deletions cadc-sia/src/main/java/ca/nrc/cadc/sia2/impl/ServiceAvailability.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,8 @@
import ca.nrc.cadc.reg.client.RegistryClient;
import ca.nrc.cadc.sia2.SiaRunner;
import ca.nrc.cadc.util.FileUtil;
import ca.nrc.cadc.util.InvalidConfigException;
import ca.nrc.cadc.util.MultiValuedProperties;
import ca.nrc.cadc.util.PropertiesReader;
import ca.nrc.cadc.vosi.Availability;
import ca.nrc.cadc.vosi.AvailabilityPlugin;
Expand All @@ -94,7 +96,7 @@
public class ServiceAvailability implements AvailabilityPlugin {

private static final Logger log = Logger.getLogger(ServiceAvailability.class);
private static final String CONFIG_FILE_NAME = SiaRunner.class.getSimpleName() + ".properties";
private static final String CONFIG_FILE_NAME = "sia.properties";
private static final String CONFIG_TAP_URI_KEY = "tapURI";

private String applicationName;
Expand Down Expand Up @@ -190,16 +192,13 @@ public static String getTapURI() {
}

private static String getTapURIProperty() throws IOException {
// Try to get from a file on disk first.
final PropertiesReader propertiesReader = new PropertiesReader(CONFIG_FILE_NAME);

if (propertiesReader.canRead()) {
return propertiesReader.getFirstPropertyValue(CONFIG_TAP_URI_KEY);
} else {
URL url = FileUtil.getURLFromResource(CONFIG_FILE_NAME, ServiceAvailability.class);
Properties props = new Properties();
props.load(url.openStream());
return props.getProperty(CONFIG_TAP_URI_KEY);
}
MultiValuedProperties mvp = propertiesReader.getAllProperties();
String ret = mvp.getFirstPropertyValue(CONFIG_TAP_URI_KEY);
log.warn("found tapURI: " + ret);
if (ret != null) {
return ret;
}
throw new InvalidConfigException("not found/readable: " + CONFIG_FILE_NAME);
}
}
Loading