ref 18964: Create a Generic Resource to record Dismissed VREs

https://support.d4science.org/issues/18964

Create a library to support the resource access
This commit is contained in:
Giancarlo Panichi 2020-04-01 19:37:40 +02:00
parent a890933f73
commit 46a626ef4f
1 changed files with 46 additions and 30 deletions

View File

@ -57,19 +57,25 @@ public class DetachedREsBuilder {
for (GatewayJAXB gatewayJAXB : gatewaysJAXB) { for (GatewayJAXB gatewayJAXB : gatewaysJAXB) {
Gateway gateway = new Gateway(gatewayJAXB.getScope(), gatewayJAXB.getName(), Gateway gateway = new Gateway(gatewayJAXB.getScope(), gatewayJAXB.getName(),
gatewayJAXB.getDescription()); gatewayJAXB.getDescription());
try {
String startDate = dateFormat.format(gatewayJAXB.getStartDate()); if (gatewayJAXB.getStartDate() != null) {
gateway.setStartDate(startDate);
} catch (Exception e) { try {
logger.error("Invalid start date format for gateway: " + gatewayJAXB.getName()); String startDate = dateFormat.format(gatewayJAXB.getStartDate());
gateway.setStartDate(startDate);
} catch (Exception e) {
logger.error("Invalid start date format for gateway: " + gatewayJAXB.getName());
}
} }
try { if (gatewayJAXB.getEndDate() != null) {
String endDate = dateFormat.format(gatewayJAXB.getEndDate()); try {
gateway.setEndDate(endDate); String endDate = dateFormat.format(gatewayJAXB.getEndDate());
} catch (Exception e) { gateway.setEndDate(endDate);
logger.error("Invalid end date format for gateway: " + gatewayJAXB.getName()); } catch (Exception e) {
logger.error("Invalid end date format for gateway: " + gatewayJAXB.getName());
}
} }
gateway.setCatalogUrl(gatewayJAXB.getCatalogUrl()); gateway.setCatalogUrl(gatewayJAXB.getCatalogUrl());
@ -120,19 +126,24 @@ public class DetachedREsBuilder {
ArrayList<VO> vos = new ArrayList<>(); ArrayList<VO> vos = new ArrayList<>();
for (VOJAXB voJAXB : gatewayJAXB.getVos()) { for (VOJAXB voJAXB : gatewayJAXB.getVos()) {
VO vo = new VO(voJAXB.getScope(), voJAXB.getName(), voJAXB.getDescription()); VO vo = new VO(voJAXB.getScope(), voJAXB.getName(), voJAXB.getDescription());
try {
String startDate = dateFormat.format(voJAXB.getStartDate()); if (voJAXB.getStartDate() != null) {
vo.setStartDate(startDate); try {
} catch (Exception e) { String startDate = dateFormat.format(voJAXB.getStartDate());
logger.error("Invalid start date format for VO: " + voJAXB.getName()); vo.setStartDate(startDate);
} catch (Exception e) {
logger.error("Invalid start date format for VO: " + voJAXB.getName());
}
} }
try { if (voJAXB.getEndDate() != null) {
String endDate = dateFormat.format(voJAXB.getEndDate()); try {
vo.setEndDate(endDate); String endDate = dateFormat.format(voJAXB.getEndDate());
} catch (Exception e) { vo.setEndDate(endDate);
logger.error("Invalid end date format for VO: " + voJAXB.getName()); } catch (Exception e) {
logger.error("Invalid end date format for VO: " + voJAXB.getName());
}
} }
vo.setCatalogUrl(voJAXB.getCatalogUrl()); vo.setCatalogUrl(voJAXB.getCatalogUrl());
@ -159,19 +170,24 @@ public class DetachedREsBuilder {
ArrayList<VRE> vres = new ArrayList<>(); ArrayList<VRE> vres = new ArrayList<>();
for (VREJAXB vreJAXB : voJAXB.getVres()) { for (VREJAXB vreJAXB : voJAXB.getVres()) {
VRE vre = new VRE(vreJAXB.getScope(), vreJAXB.getName(), vreJAXB.getDescription()); VRE vre = new VRE(vreJAXB.getScope(), vreJAXB.getName(), vreJAXB.getDescription());
try {
String startDate = dateFormat.format(vreJAXB.getStartDate()); if (vreJAXB.getStartDate() != null) {
vre.setStartDate(startDate); try {
} catch (Exception e) { String startDate = dateFormat.format(vreJAXB.getStartDate());
logger.error("Invalid start date format for VO: " + vreJAXB.getName()); vre.setStartDate(startDate);
} catch (Exception e) {
logger.error("Invalid start date format for VO: " + vreJAXB.getName());
}
} }
try { if (vreJAXB.getEndDate() != null) {
String endDate = dateFormat.format(vreJAXB.getEndDate()); try {
vre.setEndDate(endDate); String endDate = dateFormat.format(vreJAXB.getEndDate());
} catch (Exception e) { vre.setEndDate(endDate);
logger.error("Invalid end date format for VO: " + vreJAXB.getName()); } catch (Exception e) {
logger.error("Invalid end date format for VO: " + vreJAXB.getName());
}
} }
vre.setCatalogUrl(vreJAXB.getCatalogUrl()); vre.setCatalogUrl(vreJAXB.getCatalogUrl());
vre.setManagers(vreJAXB.getManagers()); vre.setManagers(vreJAXB.getManagers());