gCubeSystem
/
gcat
15
0
Fork 0
Code Issues Pull Requests Releases 13 Wiki Activity

Merged from release branch 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/data-publishing/gcat@181278 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Luca Frosini 2019-07-22 09:54:05 +00:00
parent fd0d1586cf
commit 0986131e1d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
distro/changelog.xml
View File

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE xml> <!DOCTYPE xml>
<ReleaseNotes> <ReleaseNotes>
<Changeset component="org.gcube.data-publishing.gcat.1-3-0" date="${buildDate}">
<Change>Removed the requirement of providing the id of an item in update #16740</Change>
</Changeset>
<Changeset component="org.gcube.data-publishing.gcat.1-2-0" date="${buildDate}"> <Changeset component="org.gcube.data-publishing.gcat.1-2-0" date="${buildDate}">
<Change>Separated REST class for Profile management from the logic which effectively manage profile on IS</Change> <Change>Separated REST class for Profile management from the logic which effectively manage profile on IS</Change>
<Change>Tags are now properly created/added according to profile definition #16182</Change> <Change>Tags are now properly created/added according to profile definition #16182</Change>

2
src/main/java/org/gcube/gcat/persistence/ckan/CKANPackage.java
View File

@ -418,9 +418,9 @@ public class CKANPackage extends CKAN {
public String update(String json) { public String update(String json) {
try { try {
JsonNode jsonNode = validateJson(json); JsonNode jsonNode = validateJson(json);
this.itemID = jsonNode.get(ID_KEY).asText();
read(); read();
this.itemID = result.get(ID_KEY).asText();
Map<String, CKANResource> originalResources = new HashMap<>(); Map<String, CKANResource> originalResources = new HashMap<>();
ArrayNode originalResourcesarrayNode = (ArrayNode) result.get(RESOURCES_KEY); ArrayNode originalResourcesarrayNode = (ArrayNode) result.get(RESOURCES_KEY);

8
src/main/java/org/gcube/gcat/persistence/ckan/CKANResource.java
View File

@ -289,7 +289,13 @@ public class CKANResource extends CKAN {
} }
protected boolean isStorageFile(URL url) { protected boolean isStorageFile(URL url) {
URL urlToCheck = getFinalURL(url); URL urlToCheck = url;
try {
urlToCheck = getFinalURL(url);
}catch (Exception e) {
// TODO Evaluate if we want to validate the URL. If th URL does not exists the service
// could decide refuse the Resource Creation
}
if(urlToCheck.getHost().compareTo(URI_RESOLVER_STORAGE_HUB_HOST) == 0) { if(urlToCheck.getHost().compareTo(URI_RESOLVER_STORAGE_HUB_HOST) == 0) {
if(urlToCheck.getPath().startsWith(URI_RESOLVER_STORAGE_HUB_PATH)) { if(urlToCheck.getPath().startsWith(URI_RESOLVER_STORAGE_HUB_PATH)) {
persistedURL = urlToCheck; persistedURL = urlToCheck;