Skip to content

Commit

Permalink
udpate to new arg handling
Browse files Browse the repository at this point in the history
  • Loading branch information
Al Niessner authored and Al Niessner committed Feb 9, 2024
1 parent 158a934 commit 3b905ef
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 31 deletions.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@
<version>5.7.0</version>
<scope>test</scope>
</dependency>
<!-- two artifacts for complete configuration parsing -->
<dependency>
<!-- three artifacts for complete configuration parsing -->
<dependency>
<groupId>jakarta.xml.bind</groupId>
<artifactId>jakarta.xml.bind-api</artifactId>
<version>4.0.1</version>
Expand Down
22 changes: 0 additions & 22 deletions src/main/java/gov/nasa/pds/harvest/cfg/CognitoContentWrapper.java

This file was deleted.

8 changes: 1 addition & 7 deletions src/main/java/gov/nasa/pds/harvest/cfg/ConfigManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,7 @@ static public List<String> exchangeLidvids (List<CollectionType> ids) {
return lidvids;
}
static public ConnectionFactory exchangeRegistry (RegistryType xml) throws Exception {
if (xml.getServerUrl() != null) {
return EstablishConnectionFactory.directly (xml.getServerUrl().getValue(), xml.getAuth(), xml.getServerUrl().isTrustSelfSigned()).setIndexName(xml.getIndex());
}
if (xml.getCognitoCliendId() != null) {
return EstablishConnectionFactory.viaCognito (new CognitoContentWrapper(xml.getCognitoCliendId()), xml.getAuth()).setIndexName(xml.getIndex());
}
throw new RuntimeException("New XML/Java choices in registry_type/RegistryType that are not handled.");
return EstablishConnectionFactory.from (xml.getValue(), xml.getAuth());
}
static public HarvestConfigurationType read(File file) throws JAXBException {
JAXBContext jaxbContext = new JAXBContextFactory().createContext(new Class[]{Harvest.class}, null);
Expand Down

0 comments on commit 3b905ef

Please sign in to comment.