gCubeSystem
/
uri-resolver
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

task_24792 #7

Merged
francesco.mangiacrapa merged 35 commits from task_24792 into master 2023-03-28 12:30:20 +02:00
Conversation 0 Commits 35 Files Changed 14 +16 -10
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7c0928b1e9 - Show all commits

2
src/main/java/org/gcube/datatransfer/resolver/geoportal/GeoportalRequest.java
View File

@ -26,7 +26,7 @@ public class GeoportalRequest {
@JsonProperty(P_GCUBE_SCOPE) @JsonProperty(P_GCUBE_SCOPE)
private String gcubeScope; private String gcubeScope;
@JsonProperty(P_TARGET_APP) @JsonProperty(P_TARGET_APP)
private String targetApp; private String targetAppName;
/** /**
* It is the UCD ID {usecase_id} * It is the UCD ID {usecase_id}
*/ */

24
src/main/java/org/gcube/datatransfer/resolver/services/GeoportalResolver.java
View File

@ -285,19 +285,25 @@ public class GeoportalResolver {
"The scope '" + scope + "' does not matching any scope in the infrastructure. Is it valid?", "The scope '" + scope + "' does not matching any scope in the infrastructure. Is it valid?",
this.getClass(), helpURI); this.getClass(), helpURI);
TargetAppGeoportalCodes resoruceGeoportalCodes = TargetAppGeoportalCodes String targetAppName = jsonRequest.getTargetAppName();
.valueOfName(jsonRequest.getTargetApp());
if (resoruceGeoportalCodes == null) { TargetAppGeoportalCodes resoruceGeoportalCodes = null;
LOG.error("Target application parameter is null/malformed");
if (targetAppName == null) {
resoruceGeoportalCodes = TargetAppGeoportalCodes.GEO; resoruceGeoportalCodes = TargetAppGeoportalCodes.GEO;
LOG.info("Target application using default: " + resoruceGeoportalCodes); LOG.error("Target application parameter is null, using default: " + resoruceGeoportalCodes);
} else { } else {
List<String> targetApps = Arrays.asList(TargetAppGeoportalCodes.values()).stream()
.map(TargetAppGeoportalCodes::getTarget_app).collect(Collectors.toList());
throw ExceptionManager.badRequestException(req, resoruceGeoportalCodes = TargetAppGeoportalCodes.valueOfName(jsonRequest.getTargetAppName());
"Target application is null/malformed. It must be: " + targetApps, this.getClass(), helpURI);
if (resoruceGeoportalCodes == null) {
LOG.error("Target application parameter is malformed");
List<String> targetApps = Arrays.asList(TargetAppGeoportalCodes.values()).stream()
.map(TargetAppGeoportalCodes::getTarget_app).collect(Collectors.toList());
throw ExceptionManager.badRequestException(req,
"Target application is wrong. It must be one value of: " + targetApps, this.getClass(),
helpURI);
}
} }
String linkURL = String.format("%s/%s/%s/%s/%s", serverUrl, resoruceGeoportalCodes.getId(), vreName, String linkURL = String.format("%s/%s/%s/%s/%s", serverUrl, resoruceGeoportalCodes.getId(), vreName,